aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-05-14 18:07:43 -0700
committerfriendica <info@friendica.com>2014-05-14 18:07:43 -0700
commit7c4503968d3688ef6ce0a8fda53b722e228aca8a (patch)
tree3a614cd2e7c3e51686490e90b8f6dce369bcf799
parent5660e31459cb89724323b4cf5997cdda0a73c4e6 (diff)
parent0bfd08b547891a839a7cefc1e592254f72c7ffd8 (diff)
downloadvolse-hubzilla-7c4503968d3688ef6ce0a8fda53b722e228aca8a.tar.gz
volse-hubzilla-7c4503968d3688ef6ce0a8fda53b722e228aca8a.tar.bz2
volse-hubzilla-7c4503968d3688ef6ce0a8fda53b722e228aca8a.zip
Merge branch 'navbacker'
-rw-r--r--view/css/choklet.css5
-rw-r--r--view/css/choklet_bannertwo.css32
-rw-r--r--view/css/choklet_edgesthree.css6
-rw-r--r--view/css/choklet_edgestwo.css6
-rw-r--r--view/css/choklet_full.css6
-rw-r--r--view/css/choklet_three.css6
-rw-r--r--view/php/choklet.php3
7 files changed, 51 insertions, 13 deletions
diff --git a/view/css/choklet.css b/view/css/choklet.css
index e5e0240f5..bf97e07b7 100644
--- a/view/css/choklet.css
+++ b/view/css/choklet.css
@@ -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;
diff --git a/view/css/choklet_bannertwo.css b/view/css/choklet_bannertwo.css
index 386f8ead3..014c2c893 100644
--- a/view/css/choklet_bannertwo.css
+++ b/view/css/choklet_bannertwo.css
@@ -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 {
diff --git a/view/css/choklet_edgesthree.css b/view/css/choklet_edgesthree.css
index ad4b4e29c..df936d66e 100644
--- a/view/css/choklet_edgesthree.css
+++ b/view/css/choklet_edgesthree.css
@@ -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;
diff --git a/view/css/choklet_edgestwo.css b/view/css/choklet_edgestwo.css
index 96bfbc696..a591a01c4 100644
--- a/view/css/choklet_edgestwo.css
+++ b/view/css/choklet_edgestwo.css
@@ -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;
diff --git a/view/css/choklet_full.css b/view/css/choklet_full.css
index 883bb1ed3..d00178016 100644
--- a/view/css/choklet_full.css
+++ b/view/css/choklet_full.css
@@ -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;
diff --git a/view/css/choklet_three.css b/view/css/choklet_three.css
index 5bbff0e3b..5a305efcf 100644
--- a/view/css/choklet_three.css
+++ b/view/css/choklet_three.css
@@ -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;
diff --git a/view/php/choklet.php b/view/php/choklet.php
index 74891044a..0d8b66c29 100644
--- a/view/php/choklet.php
+++ b/view/php/choklet.php
@@ -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">&nbsp;</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>