Merge branch 'navbacker'

6 files changed, 48 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;