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 | |
| parent | f05181322cf08539fb147bbd5f6edfb93c254b7e (diff) | |
| download | volse-hubzilla-171b6a222d164e157ebaaba6ee177ccbb6c14514.tar.gz volse-hubzilla-171b6a222d164e157ebaaba6ee177ccbb6c14514.tar.bz2 volse-hubzilla-171b6a222d164e157ebaaba6ee177ccbb6c14514.zip | |
fixes for latest bootstrap
| -rw-r--r-- | view/css/bootstrap-red.css | 12 | ||||
| -rw-r--r-- | view/php/default.php | 2 | ||||
| -rw-r--r-- | view/php/full.php | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 38 |
4 files changed, 30 insertions, 24 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 4cfd3d635..c8da05787 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -29,6 +29,11 @@ nav .badge { height: 2.3rem; } +.navbar-toggler-right { + padding: 0.2rem 0; +} + + #navbar-collapse-1 i { font-size: 1rem; } @@ -42,13 +47,14 @@ nav.navbar { max-height: 100vh; } +#navbar-collapse-2 { + flex-basis: 100%; +} + #navbar-collapse-2.show { overflow: auto; } -.navbar-toggler-right { - top: 0.5rem; -} /* nav overrides end */ .wall-item-tools .dropdown-menu { diff --git a/view/php/default.php b/view/php/default.php index 1df82daa5..e4553a17f 100644 --- a/view/php/default.php +++ b/view/php/default.php @@ -8,7 +8,7 @@ <body <?php if($page['direction']) echo 'dir="rtl"' ?> > <?php if(x($page,'banner')) echo $page['banner']; ?> <header><?php if(x($page,'header')) echo $page['header']; ?></header> - <nav class="navbar fixed-top navbar-expand-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <main> <aside id="region_1"><div id="left_aside_spacer"><div id="left_aside_wrapper"><?php if(x($page,'aside')) echo $page['aside']; ?></div></div></aside> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?> diff --git a/view/php/full.php b/view/php/full.php index 522dafb28..64e32c5bd 100644 --- a/view/php/full.php +++ b/view/php/full.php @@ -7,7 +7,7 @@ </head> <body> <header><?php if(x($page,'header')) echo $page['header']; ?></header> - <nav class="navbar fixed-top navbar-expand-sm navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> + <nav class="navbar fixed-top navbar-expand-md navbar-inverse bg-inverse"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <section><?php if(x($page,'content')) echo $page['content']; ?> <div id="page-footer"></div> </section> 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}} |