Merge pull request #5512 from owncloud/css-fixleftcontentrightcontent

Fix leftcontent/right content, fixes contacts app

2 files changed, 6 insertions, 6 deletions

diff --git a/core/css/styles.css b/core/css/styles.css
index 62ee0e56cae..20357434c13 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -202,7 +202,7 @@ input[type="submit"].enabled {
 	-moz-box-sizing:border-box; box-sizing:border-box;
 }
 #leftcontent, .leftcontent {
-	position:relative; overflow:auto; width:20em; height:100%;
+	position:relative; overflow:auto; width:256px; height:100%;
 	background:#f8f8f8; border-right:1px solid #ddd;
 	-moz-box-sizing:border-box; box-sizing:border-box;
 }
@@ -211,7 +211,11 @@ input[type="submit"].enabled {
 #leftcontent li.active, .leftcontent li.active { font-weight:bold; }
 #leftcontent li:hover, .leftcontent li:hover { color:#333; background:#ddd; }
 #leftcontent a { height:100%; display:block; margin:0; padding:0 1em 0 0; float:left; }
-#rightcontent, .rightcontent { position:fixed; top:6.4em; left:24.5em; overflow:auto }
+#rightcontent, .rightcontent { position:fixed; top:89px; left: 336px; overflow:auto }
+
+#controls + .leftcontent{
+	top: 44px;
+}
 
 #emptycontent {
 	font-size: 1.5em;
diff --git a/settings/css/settings.css b/settings/css/settings.css
index b47075241df..6eef96c2dc1 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -58,10 +58,6 @@ tr:hover>td.remove>a, tr:hover>td.password>img,tr:hover>td.displayName>img, tr:h
 tr:hover>td.remove>a { float:right; }
 li.selected { background-color:#ddd; }
 table.grid { width:100%; }
-#leftcontent, .leftcontent {
-	width: 256px;
-}
-#rightcontent, .rightcontent { top: 80px; left: 336px; }
 #rightcontent { padding-left: 10px; }
 div.quota {
 	float: right;