Merge branch 'master' into core-em-to-px

Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css

2 files changed, 68 insertions, 26 deletions

diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css
new file mode 100644
index 00000000000..cebe906dd59
--- /dev/null
+++ b/apps/files_sharing/css/authenticate.css
@@ -0,0 +1,26 @@
+#body-login form label.infield {
+	width: 190px;
+	padding: 10px;
+	left: 8px;
+	top: 8px;
+}
+
+#password {
+	width: 190px !important;
+	padding: 10px;
+	margin:	6px;
+}
+
+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"] {
+	position: absolute;
+	top: 0px;
+}
diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 70345c3577d..e948811c032 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,17 +1,17 @@
 body {
-	background:#ddd;
+	height: auto;
 }
 
 #header {
 	background: #1d2d44 url('%webroot%/core/img/noise.png') repeat;
-	height:40px;
+	height:32px;
 	left:0;
-	line-height:40px;
+	line-height:32px;
 	position:fixed;
 	right:0;
 	top:0;
 	z-index:100;
-	padding:8px;
+	padding:7px;
 }
 
 #details {
@@ -22,15 +22,20 @@ body {
 #public_upload,
 #download {
 	font-weight:700;
-	margin: 0 6px 0 0;
+	margin: 0 0 0 6px;
 	padding: 0 5px;
-	height: 27px;
+	height: 32px;
 	float: left;
 
 }
 
 .header-right #details {
-	margin-right: 32px;
+	margin-right: 28px;
+}
+
+.header-right {
+	padding: 0;
+	height: 32px;
 }
 
 #public_upload {
@@ -44,12 +49,14 @@ body {
 	vertical-align:text-bottom;
 }
 
+#controls {
+	left: 0;
+}
+
 #preview {
-	background:#eee;
-	border-bottom:1px solid #f8f8f8;
-	min-height:480px;
-	text-align:center;
-	margin:45px auto;
+	background: #fff;
+	text-align: center;
+	margin: 45px auto 0;
 }
 
 #noPreview {
@@ -57,11 +64,16 @@ body {
 	padding-top:90px;
 }
 
+footer {
+	margin-top: 65px;
+}
+
 p.info {
-	color:#777;
-	text-align:center;
-	width:352px;
-	margin:32px auto;
+	color: #777;
+	text-align: center;
+	width: 352px;
+	margin: 0 auto;
+	padding: 20px;
 }
 
 p.info a {
@@ -90,7 +102,7 @@ thead{
 #data-upload-form {
 	position: relative;
 	right: 0;
-	height: 27px;
+	height: 32px;
 	overflow: hidden;
 	padding: 0;
 	float: right;
@@ -109,26 +121,30 @@ thead{
 	width: 100% !important;
 }
 
-#download span {
-	position: relative;
-	bottom: 3px;
-}
-
 #publicUploadButtonMock {
 	position:relative;
 	display:block;
 	width:100%;
-	height:27px;
+	height:32px;
 	cursor:pointer;
 	z-index:10;
 	background-image:url('%webroot%/core/img/actions/upload.svg');
 	background-repeat:no-repeat;
-	background-position:7px 6px;
+	background-position:7px 8px;
 }
 
 #publicUploadButtonMock span {
 	margin: 0 5px 0 28px;
-	position: relative;
-	top: -2px;
 	color: #555;
 }
+
+.directLink {
+	margin-bottom: 20px;
+}
+	.directLink label {
+		font-weight: normal;
+	}
+	.directLink input {
+		margin-left: 10px;
+		width: 300px;
+	}