Merge https://github.com/redmatrix/hubzilla into pending_merge

2015-09-18 14:32:23 -07:00 · 2015-09-18 14:32:23 -07:00 · 1a16822987
commit 1a16822987
parent fdd4c1b9d1 87c8cf4892
8 changed files with 8 additions and 1 deletions
--- a/view/css/choklet.css
+++ b/view/css/choklet.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;
--- a/view/css/choklet_bannertwo.css
+++ b/view/css/choklet_bannertwo.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;
--- a/view/css/choklet_edgesthree.css
+++ b/view/css/choklet_edgesthree.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;
--- a/view/css/choklet_edgestwo.css
+++ b/view/css/choklet_edgestwo.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;
--- a/view/css/choklet_full.css
+++ b/view/css/choklet_full.css
@ -52,4 +52,4 @@ section {
 #blog-margin {
 	margin-right: 5%;
 	margin-left: 5%;
-}
+}
--- a/view/css/choklet_three.css
+++ b/view/css/choklet_three.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;
--- a/view/css/default.css
+++ b/view/css/default.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;
--- a/view/css/full.css
+++ b/view/css/full.css
@ -1,5 +1,6 @@
 header #banner {
 	position: fixed;
+	top: 0px;
 	width: 33%;
 	margin-left: 33%;
 	margin-right: 33%;