harukin/theme
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test:: navbar-margin fix

Browse Source
This commit is contained in:
harukin 2019-01-06 16:03:05 +09:00
parent 30d4b3eff4
commit 1209496a29
1 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
view/theme/plusfuture/tpl/navbar_default.tpl
View File

@ -16,11 +16,10 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
<div style="display: flex;">
<button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1"> <button id="expand-aside" type="button" class="d-lg-none navbar-toggler border-0" data-toggle="offcanvas" data-target="#region_1">
<i class="fa fa-bars" id="expand-aside-icon"></i> <i class="fa fa-bars" id="expand-aside-icon"></i>
</button> </button>
<div id="banner" class="navbar-text">{{$banner}}</div> <div id="banner" class="navbar-text">{{$banner}}</div>
{{if $sel.name}} {{if $sel.name}}
<div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}"> <div id="nav-app-link-wrapper" class="navbar-nav{{if $sitelocation || ! $settings_url}} has_location mr-auto{{/if}}">
@ -30,7 +29,6 @@
<br><small>{{$sitelocation}}</small> <br><small>{{$sitelocation}}</small>
{{/if}} {{/if}}
</a> </a>
</div> </div>
{{if $settings_url}} {{if $settings_url}}
@ -41,21 +39,9 @@
</div> </div>
{{/if}} {{/if}}
{{/if}} {{/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="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
<i class="fa fa-th"></i>
</button>
{{if $localuser || $nav.pubs}}
<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
</button>
{{/if}}
</div> </div>
<div class="collapse navbar-collapse" id="navbar-collapse-1"> <div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
{{if $nav.login && !$userinfo}} {{if $nav.login && !$userinfo}}
@ -82,8 +68,6 @@
</li> </li>
{{/if}} {{/if}}
</ul> </ul>
<ul id="nav-right" class="navbar-nav ml-auto"> <ul id="nav-right" class="navbar-nav ml-auto">
<li class="nav-item collapse clearfix" id="nav-search"> <li class="nav-item collapse clearfix" id="nav-search">
<form class="form-inline" method="get" action="{{$nav.search.4}}" role="search"> <form class="form-inline" method="get" action="{{$nav.search.4}}" role="search">
@ -149,9 +133,24 @@
</li> </li>
{{/foreach}} {{/foreach}}
{{/if}} {{/if}}
</ul> </ul>
</div> </div>
<div style="display: flex;">
<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="menu-btn" class="navbar-toggler border-0" type="button" data-toggle="collapse" data-target="#navbar-collapse-2">
<i class="fa fa-th"></i>
</button>
{{if $localuser || $nav.pubs}}
<button id="notifications-btn-1" type="button" class="navbar-toggler border-0 notifications-btn">
<i id="notifications-btn-icon-1" class="fa fa-exclamation-circle notifications-btn-icon"></i>
</button>
{{/if}}
</div>
{{if $userinfo}} {{if $userinfo}}
<div class="dropdown"> <div class="dropdown">
<div class="fakelink usermenu" data-toggle="dropdown"> <div class="fakelink usermenu" data-toggle="dropdown">
@ -199,6 +198,7 @@
{{/if}} {{/if}}
</div> </div>
{{/if}} {{/if}}
</div>
<div class="collapse d-lg-none" id="navbar-collapse-2"> <div class="collapse d-lg-none" id="navbar-collapse-2">
<div class="navbar-nav mr-auto"> <div class="navbar-nav mr-auto">
{{if $channel_apps.0}} {{if $channel_apps.0}}