diff options
| author | Mario Vavti <mario@mariovavti.com> | 2017-03-28 15:41:12 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2017-03-28 15:41:12 +0200 |
| commit | 171b6a222d164e157ebaaba6ee177ccbb6c14514 (patch) | |
| tree | f6409938ca13855ee02c9c1c7f9994380056f2e3 /view/tpl | |
| parent | f05181322cf08539fb147bbd5f6edfb93c254b7e (diff) | |
| download | volse-hubzilla-171b6a222d164e157ebaaba6ee177ccbb6c14514.tar.gz volse-hubzilla-171b6a222d164e157ebaaba6ee177ccbb6c14514.tar.bz2 volse-hubzilla-171b6a222d164e157ebaaba6ee177ccbb6c14514.zip | |
fixes for latest bootstrap
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/nav.tpl | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 0a9b94758..f7953c5f3 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -10,24 +10,6 @@ {{/if}} </div> {{/if}} -<div class="navbar-toggler-right"> - {{if $nav.help.6}} - <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> - <i class="fa fa-question-circle"></i> - </button> - {{/if}} - <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> - <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> - </button> - {{if $localuser}} - <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> - <i class="fa fa-exclamation-circle"></i> - </button> - {{/if}} - <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> - <i class="fa fa-bars"></i> - </button> -</div> {{if $userinfo}} <div class="dropdown usermenu"> <div class="fakelink" data-toggle="dropdown"> @@ -73,6 +55,24 @@ {{/if}} </div> {{/if}} +<div class="navbar-toggler-right"> + {{if $nav.help.6}} + <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> + <i class="fa fa-question-circle"></i> + </button> + {{/if}} + <button id="expand-aside" type="button" class="navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> + <i class="fa fa-arrow-circle-right" id="expand-aside-icon"></i> + </button> + {{if $localuser}} + <button id="notifications-btn" type="button" class="navbar-toggler border-0 text-white" data-toggle="collapse" data-target="#navbar-collapse-1"> + <i class="fa fa-exclamation-circle"></i> + </button> + {{/if}} + <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar-collapse-2"> + <i class="fa fa-bars"></i> + </button> +</div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.network}} @@ -201,7 +201,7 @@ </ul> </div> <div class="collapse d-md-none" id="navbar-collapse-2"> - <div class="navbar-nav"> + <div class="navbar-nav mr-auto"> {{foreach $navapps as $navapp}} {{$navapp|replace:'dropdown-item':'nav-link'}} {{/foreach}} |