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

fix fluid layout for choklet_bannertwo

Browse Source
This commit is contained in:
friendica 2014-05-14 18:07:01 -07:00
parent b31aa49a43
commit 0bfd08b547
7 changed files with 43 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
view/css/choklet.css
View File

@ -19,9 +19,7 @@ nav.navbar {
} }
#nav-backer { #nav-backer {
position: absolute; width: 100%;
top: 0;
left: 0;
} }
aside#region_1 { aside#region_1 {

31
view/css/choklet_bannertwo.css
View File

@ -6,7 +6,7 @@ header #banner {
margin-right: auto; margin-right: auto;
} }
#blog-banner { #blog-banner {
/* position: relative; */ position: relative;
width: 100%; width: 100%;
margin-bottom: 20px; margin-bottom: 20px;
margin-left: auto; margin-left: auto;
@ -14,24 +14,27 @@ header #banner {
overflow-x: hidden; overflow-x: hidden;
} }
main {
display: table;
table-layout: fixed;
position: relative;
width: 100%;
height: 100%;
}
nav.navbar { nav.navbar {
width: 100%; width: 100%;
} }
#nav-backer { #nav-backer {
position: absolute;
top: 0;
left: 0;
width: 100%; width: 100%;
z-index: 0;
} }
aside#region_1 { aside#region_1 {
display: block; min-width: 231px;
min-width: 210px; max-width: 231px;
max-width: 220px; display: table-cell;
width: 20%; width: 231px;
float: left;
margin-left: 10px; margin-left: 10px;
} }
@ -43,11 +46,9 @@ aside input[type='text'] {
section { section {
margin-left: 15px; margin-left: 15px;
margin-right: 15px; margin-right: 15px;
float: left; width: 100%;
min-width: 400px; display: table-cell;
width: 70%; padding-bottom: 200px;
display: block;
padding-bottom: 350px;
} }
#region_3 { #region_3 {

6
view/css/choklet_edgesthree.css
View File

@ -18,6 +18,12 @@ nav.navbar {
margin-right: 5%; margin-right: 5%;
} }
#nav-backer {
width: 90%;
margin-left: 5%;
margin-right: 5%;
}
aside#region_1 { aside#region_1 {
display: block; display: block;
min-width: 210px; min-width: 210px;

6
view/css/choklet_edgestwo.css
View File

@ -19,6 +19,12 @@ nav.navbar {
margin-right: 5%; margin-right: 5%;
} }
#nav-backer {
width: 90%;
margin-left: 5%;
margin-right: 5%;
}
aside#region_1 { aside#region_1 {
display: block; display: block;
min-width: 210px; min-width: 210px;

6
view/css/choklet_full.css
View File

@ -12,6 +12,12 @@ nav.navbar {
margin-right: 5%; margin-right: 5%;
} }
#nav-backer {
width: 90%;
margin-left: 5%;
margin-right: 5%;
}
aside#region_1 { aside#region_1 {
display: block; display: block;
min-width: 210px; min-width: 210px;

6
view/css/choklet_three.css
View File

@ -18,6 +18,12 @@ nav.navbar {
margin-right: 0; margin-right: 0;
} }
#nav-backer {
width: 100%;
margin-left: 0;
margin-right: 0;
}
aside#region_1 { aside#region_1 {
display: block; display: block;
min-width: 210px; min-width: 210px;

2
view/php/choklet.php
View File

@ -11,11 +11,13 @@
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"><?php if(x($page,'nav')) echo $page['nav']; ?></nav> <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">&nbsp;</div> <div id="nav-backer" class="navbar">&nbsp;</div>
<div id="blog-banner"><?php if(x($page,'banner')) echo $page['banner']; ?></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> <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']; ?> <section id="region_2"><?php if(x($page,'content')) echo $page['content']; ?>
<div id="page-footer"></div> <div id="page-footer"></div>
<div id="pause"></div> <div id="pause"></div>
</section> </section>
</main>
<aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside> <aside id="region_3"><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></aside>
<div class="clear"></div> <div class="clear"></div>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>