diff options
| author | zotlabs <mike@macgirvin.com> | 2018-04-02 20:45:18 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-04-02 20:45:18 -0700 |
| commit | d68ce0f3456437a452b37782df3322eb36c8ee3f (patch) | |
| tree | 83ce5d46fba13c9c76c5ecf2f9a16d14cf1f6cc6 | |
| parent | 4e21c14ff6b8c8dddf10acaf5cac9fe0764e4899 (diff) | |
| parent | 0e09dca9529ee15ad8457353391a9c97de6aeaf1 (diff) | |
| download | volse-hubzilla-d68ce0f3456437a452b37782df3322eb36c8ee3f.tar.gz volse-hubzilla-d68ce0f3456437a452b37782df3322eb36c8ee3f.tar.bz2 volse-hubzilla-d68ce0f3456437a452b37782df3322eb36c8ee3f.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/navbar_tucson.tpl | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index 92b067bcb..532e10f22 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -91,7 +91,7 @@ <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.login && !$userinfo}} - <li class="nav-item d-none d-xl-flex"> + <li class="nav-item d-lg-flex"> {{if $nav.loginmenu.1.4}} <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} @@ -104,12 +104,12 @@ </li> {{/if}} {{if $nav.register}} - <li class="nav-item {{$nav.register.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.register.2}} d-lg-flex"> <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> </li> {{/if}} {{if $nav.alogout}} - <li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.alogout.2}} d-lg-flex"> <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> </li> {{/if}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 92b067bcb..800f863dd 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -91,7 +91,7 @@ <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="navbar-nav mr-auto"> {{if $nav.login && !$userinfo}} - <li class="nav-item d-none d-xl-flex"> + <li class="nav-item d-lg-flex"> {{if $nav.loginmenu.1.4}} <a class="nav-link" href="#" title="{{$nav.loginmenu.1.3}}" id="{{$nav.loginmenu.1.4}}" data-toggle="modal" data-target="#nav-login"> {{$nav.loginmenu.1.1}} @@ -104,12 +104,12 @@ </li> {{/if}} {{if $nav.register}} - <li class="nav-item {{$nav.register.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.register.2}} d-lg-flex"> <a class="nav-link" href="{{$nav.register.0}}" title="{{$nav.register.3}}" id="{{$nav.register.4}}">{{$nav.register.1}}</a> </li> {{/if}} {{if $nav.alogout}} - <li class="nav-item {{$nav.alogout.2}} d-none d-xl-flex"> + <li class="nav-item {{$nav.alogout.2}} d-none d-lg-flex"> <a class="nav-link" href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" id="{{$nav.alogout.4}}">{{$nav.alogout.1}}</a> </li> {{/if}} |