Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 05:35:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixes for latest bootstrap

Browse source
This commit is contained in:
Mario Vavti 2017-03-28 15:41:12 +02:00
parent f05181322c
commit 171b6a222d
4 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
view/css/bootstrap-red.css vendored
View file

@ -29,6 +29,11 @@ nav .badge {
height: 2.3rem; height: 2.3rem;
} }
.navbar-toggler-right {
padding: 0.2rem 0;
}
#navbar-collapse-1 i { #navbar-collapse-1 i {
font-size: 1rem; font-size: 1rem;
} }
@ -42,13 +47,14 @@ nav.navbar {
max-height: 100vh; max-height: 100vh;
} }
#navbar-collapse-2 {
flex-basis: 100%;
}
#navbar-collapse-2.show { #navbar-collapse-2.show {
overflow: auto; overflow: auto;
} }
.navbar-toggler-right {
top: 0.5rem;
}
/* nav overrides end */ /* nav overrides end */
.wall-item-tools .dropdown-menu { .wall-item-tools .dropdown-menu {

2
view/php/default.php
View file

@ -8,7 +8,7 @@
<body <?php if($page['direction']) echo 'dir="rtl"' ?> > <body <?php if($page['direction']) echo 'dir="rtl"' ?> >
<?php if(x($page,'banner')) echo $page['banner']; ?> <?php if(x($page,'banner')) echo $page['banner']; ?>
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <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> <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> <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']; ?> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>

2
view/php/full.php
View file

@ -7,7 +7,7 @@
</head> </head>
<body> <body>
<header><?php if(x($page,'header')) echo $page['header']; ?></header> <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']; ?> <section><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
</section> </section>

38
view/tpl/nav.tpl
View file

@ -10,24 +10,6 @@
{{/if}} {{/if}}
</div> </div>
{{/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="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}} {{if $userinfo}}
<div class="dropdown usermenu"> <div class="dropdown usermenu">
<div class="fakelink" data-toggle="dropdown"> <div class="fakelink" data-toggle="dropdown">
@ -73,6 +55,24 @@
{{/if}} {{/if}}
</div> </div>
{{/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="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"> <div class="collapse navbar-collapse" id="navbar-collapse-1">
<ul class="navbar-nav mr-auto"> <ul class="navbar-nav mr-auto">
{{if $nav.network}} {{if $nav.network}}
@ -201,7 +201,7 @@
</ul> </ul>
</div> </div>
<div class="collapse d-md-none" id="navbar-collapse-2"> <div class="collapse d-md-none" id="navbar-collapse-2">
<div class="navbar-nav"> <div class="navbar-nav mr-auto">
{{foreach $navapps as $navapp}} {{foreach $navapps as $navapp}}
{{$navapp|replace:'dropdown-item':'nav-link'}} {{$navapp|replace:'dropdown-item':'nav-link'}}
{{/foreach}} {{/foreach}}