merge master into mobile-style

2 files changed, 7 insertions, 10 deletions

diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
index cebe906dd59..ef963ba7c65 100644
--- a/apps/files_sharing/css/authenticate.css
+++ b/apps/files_sharing/css/authenticate.css
@@ -11,16 +11,13 @@
 	margin:	6px;
 }
 
-input[type="submit"]{
+input[type='submit'] {
 	width: 45px;
 	height: 45px;
 	margin:	6px;
-	background-image: url('%webroot%/core/img/actions/confirm.svg');
-	background-repeat: no-repeat;
-	background-position: center;
 }
 
-#body-login input[type="submit"] {
+#body-login input[type='submit'] {
 	position: absolute;
 	top: 0px;
 }
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index a3bc36dcc76..c50624e20b1 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -3,7 +3,7 @@ body {
 }
 
 #header {
-	background: #1d2d44 url('%webroot%/core/img/noise.png') repeat;
+	background-color: #1d2d44;
 	height:32px;
 	left:0;
 	line-height:32px;
@@ -39,7 +39,7 @@ body {
 
 #noPreview {
 	display:none;
-	padding-top:5em;
+	padding-top:80px;
 }
 
 footer {
@@ -49,7 +49,7 @@ footer {
 p.info {
 	color: #777;
 	text-align: center;
-	width: 22em;
+	width: 352px;
 	margin: 0 auto;
 	padding: 20px;
 }
@@ -61,8 +61,8 @@ p.info a {
 
 #imgframe {
 	height:75%;
-	padding-bottom:2em;
-	padding-top:2em;
+	padding-bottom:32px;
+	padding-top:32px;
 	width:80%;
 	margin:0 auto;
 }