mirror of
https://codeberg.org/streams/streams.git
synced 2024-09-20 11:35:13 +00:00
Merge branch 'navbacker'
This commit is contained in:
commit
7c4503968d
7 changed files with 51 additions and 13 deletions
|
@ -8,7 +8,6 @@ header #banner {
|
|||
|
||||
#blog-banner {
|
||||
position: relative;
|
||||
margin-top: 75px;
|
||||
width: 100%;
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
@ -19,6 +18,10 @@ nav.navbar {
|
|||
margin-right: 0;
|
||||
}
|
||||
|
||||
#nav-backer {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
display: block;
|
||||
min-width: 210px;
|
||||
|
|
|
@ -6,8 +6,7 @@ header #banner {
|
|||
margin-right: auto;
|
||||
}
|
||||
#blog-banner {
|
||||
position: relative;
|
||||
margin-top: 75px;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
margin-bottom: 20px;
|
||||
margin-left: auto;
|
||||
|
@ -15,16 +14,27 @@ header #banner {
|
|||
overflow-x: hidden;
|
||||
}
|
||||
|
||||
main {
|
||||
display: table;
|
||||
table-layout: fixed;
|
||||
position: relative;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
nav.navbar {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
#nav-backer {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
display: block;
|
||||
min-width: 210px;
|
||||
max-width: 220px;
|
||||
width: 20%;
|
||||
float: left;
|
||||
min-width: 231px;
|
||||
max-width: 231px;
|
||||
display: table-cell;
|
||||
width: 231px;
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
|
@ -36,11 +46,9 @@ aside input[type='text'] {
|
|||
section {
|
||||
margin-left: 15px;
|
||||
margin-right: 15px;
|
||||
float: left;
|
||||
min-width: 400px;
|
||||
width: 70%;
|
||||
display: block;
|
||||
padding-bottom: 350px;
|
||||
width: 100%;
|
||||
display: table-cell;
|
||||
padding-bottom: 200px;
|
||||
}
|
||||
|
||||
#region_3 {
|
||||
|
|
|
@ -18,6 +18,12 @@ nav.navbar {
|
|||
margin-right: 5%;
|
||||
}
|
||||
|
||||
#nav-backer {
|
||||
width: 90%;
|
||||
margin-left: 5%;
|
||||
margin-right: 5%;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
display: block;
|
||||
min-width: 210px;
|
||||
|
|
|
@ -19,6 +19,12 @@ nav.navbar {
|
|||
margin-right: 5%;
|
||||
}
|
||||
|
||||
#nav-backer {
|
||||
width: 90%;
|
||||
margin-left: 5%;
|
||||
margin-right: 5%;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
display: block;
|
||||
min-width: 210px;
|
||||
|
|
|
@ -12,6 +12,12 @@ nav.navbar {
|
|||
margin-right: 5%;
|
||||
}
|
||||
|
||||
#nav-backer {
|
||||
width: 90%;
|
||||
margin-left: 5%;
|
||||
margin-right: 5%;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
display: block;
|
||||
min-width: 210px;
|
||||
|
|
|
@ -18,6 +18,12 @@ nav.navbar {
|
|||
margin-right: 0;
|
||||
}
|
||||
|
||||
#nav-backer {
|
||||
width: 100%;
|
||||
margin-left: 0;
|
||||
margin-right: 0;
|
||||
}
|
||||
|
||||
aside#region_1 {
|
||||
display: block;
|
||||
min-width: 210px;
|
||||
|
|
|
@ -9,12 +9,15 @@
|
|||
<div id="blog-margin">
|
||||
<header><?php if(x($page,'header')) echo $page['header']; ?></header>
|
||||
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav>
|
||||
<div id="nav-backer" class="navbar"> </div>
|
||||
<div id="blog-banner"><?php if(x($page,'banner')) echo $page['banner']; ?></div>
|
||||
<main>
|
||||
<aside id="region_1"><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
|
||||
<section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
|
||||
<div id="page-footer"></div>
|
||||
<div id="pause"></div>
|
||||
</section>
|
||||
</main>
|
||||
<aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
|
||||
<div class="clear"></div>
|
||||
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
|
||||
|
|
Loading…
Reference in a new issue