Merge pull request #5946 from owncloud/public-page-details

Public page details

2 files changed, 26 insertions, 12 deletions

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 801c27506f1..3ccb35e327a 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,5 +1,5 @@
 body {
-	background:#ddd;
+	height: auto;
 }
 
 #header {
@@ -22,7 +22,7 @@ body {
 #public_upload,
 #download {
 	font-weight:700;
-	margin: 0 0.4em 0 0;
+	margin: 0 0 0 .4em;
 	padding: 0 5px;
 	height: 32px;
 	float: left;
@@ -49,12 +49,14 @@ body {
 	vertical-align:text-bottom;
 }
 
+#controls {
+	left: 0;
+}
+
 #preview {
-	background:#eee;
-	border-bottom:1px solid #f8f8f8;
-	min-height:30em;
-	text-align:center;
-	margin:45px auto;
+	background: #fff;
+	text-align: center;
+	margin: 45px auto 0;
 }
 
 #noPreview {
@@ -62,11 +64,16 @@ body {
 	padding-top:5em;
 }
 
+footer {
+	margin-top: 45px;
+}
+
 p.info {
-	color:#777;
-	text-align:center;
-	width:22em;
-	margin:2em auto;
+	color: #777;
+	text-align: center;
+	width: 22em;
+	margin: 0 auto;
+	padding: 20px;
 }
 
 p.info a {
diff --git a/core/css/styles.css b/core/css/styles.css
index 9a32151deb9..fa001d41c2c 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -202,13 +202,20 @@ input[type="submit"].enabled {
 	box-sizing: border-box;
 	position: fixed;
 	right: 0;
-	left: 80px;
+	left: 0;
 	height: 44px;
+	width: 100%;
+	padding: 0;
 	margin: 0;
 	background: #eee;
 	border-bottom: 1px solid #e7e7e7;
 	z-index: 50;
 }
+/* account for shift of controls bar due to app navigation */
+#body-user #controls,
+#body-settings #controls {
+	padding-left: 80px;
+}
 #controls .button,
 #controls button,
 #controls input[type='submit'],