friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1606-dbm

This commit is contained in:
Michael Vogel 2016-06-01 14:39:08 +02:00
parent b08c3f20e9 f69409c398
commit eb3446a8b0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/theme/frio/templates/mail_head.tpl Normal file
View File

@ -0,0 +1,4 @@
<h3 class="heading">{{$messages}}</h3>
{{$tab_content}}

4
view/theme/frio/templates/nav.tpl
View File

@ -109,8 +109,8 @@
<form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}"> <form class="navbar-form" role="search" method="get" action="{{$nav.search.0}}">
<!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> --> <!-- <img class="hidden-xs" src="{{$nav.userinfo.icon}}" alt="{{$nav.userinfo.name}}" style="max-width:33px; max-height:33px; min-width:33px; min-height:33px; width:33px; height:33px;"> -->
<div class="form-group form-group-search"> <div class="form-group form-group-search">
<input id="nav-search-input-field" class="form-control form-search" type="text" name="search" placeholder="Search"> <input id="nav-search-input-field" class="form-control form-search" type="text" name="search" data-toggle="tooltip" title="{{$search_hint}}" placeholder="{{$nav.search.1}}">
<button class="btn btn-default btn-sm form-button-search" type="submit">Search</button> <button class="btn btn-default btn-sm form-button-search" type="submit">{{$nav.search.1}}</button>
</div> </div>
</form> </form>
</li> </li>