diff options
| author | friendica <info@friendica.com> | 2014-03-05 14:18:28 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-03-05 14:18:28 -0800 |
| commit | 42f184b87cb2a55270e200d8bd71d221f4ac79b8 (patch) | |
| tree | db3054c59a83afb47544bbcd40a872683479532a | |
| parent | 40746eae57c8bf7a887e6bb2a9ffc0120fd85e1f (diff) | |
| parent | c950c342d8ba32365e1ecc7e606254e678308515 (diff) | |
| download | volse-hubzilla-42f184b87cb2a55270e200d8bd71d221f4ac79b8.tar.gz volse-hubzilla-42f184b87cb2a55270e200d8bd71d221f4ac79b8.tar.bz2 volse-hubzilla-42f184b87cb2a55270e200d8bd71d221f4ac79b8.zip | |
Merge https://github.com/friendica/red into zpull
| -rw-r--r-- | view/css/bootstrap-red.css | 8 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 12 |
2 files changed, 12 insertions, 8 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 606e47838..00e2f30b7 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -105,8 +105,12 @@ nav .dropdown-menu li a { padding: 5px 10px; } -nav .navbar-collapse { - max-height: 450px; +nav .navbar-collapse .navbar-left { + float: left; +} + +nav .navbar-collapse .navbar-right { + float: right; } /* nav overrides end */ diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ec9731fef..41bc7dc10 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -33,6 +33,10 @@ </li> {{/if}} + {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} + + {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} + {{if $nav.network}} <li class="{{$sel.network}} hidden-xs"> <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="icon-th"></i></a> @@ -137,13 +141,9 @@ </form> </li> <li class="visible-xs"> - <a href="/search" title="Search"><i class="icon-search"></i></a> + <a href="/search" title="{{$nav.search.3}}"><i class="icon-search"></i></a> </li> - {{if $nav.login}}<li class="{{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} - - {{if $nav.alogout}}<li class="{{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} - {{if $nav.directory}} <li class="{{$sel.directory}}"> <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}"><i class="icon-sitemap"></i></a> @@ -155,7 +155,7 @@ <a class="{{$nav.apps.2}} dropdown-toggle" data-toggle="dropdown" href="#" rel="#nav-apps-menu" title="{{$nav.apps.3}}" ><i class="icon-cogs"></i></a> <ul class="dropdown-menu"> {{foreach $apps as $ap}} - <li>{{$ap}}</li> + <li role="presentation">{{$ap}}</li> {{/foreach}} </ul> </li> |