From 6a617fa721248c57f52c66d67753357c9c8fefee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
 <skjnldsv@protonmail.com>
Date: Sun, 22 Jan 2017 17:25:02 +0100
Subject: [PATCH] Fixed public share header buttons
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
 apps/files_sharing/css/public.css       | 63 +++++++++----------------
 apps/files_sharing/templates/public.php |  4 +-
 core/css/inputs.scss                    | 18 +++++--
 3 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index 94183cf0057..70df204a696 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -107,29 +107,30 @@ thead {
 	max-width: 90%;
 }
 
+/* header buttons */
+#details {
+	display: inline-flex;
+}
+#details button,
+#details input,
+#details .button {
+	margin: 0 5px;
+	line-height: normal;
+}
+#details button:hover,
+#details input:hover,
+#details .button:hover {
+	/* No  */
+	border-color: rgba(0,0,0,0.3) !important;
+}
+
 /* within #save */
 #save .save-form {
 	position: relative;
 }
 
 #remote_address {
-	margin: 0;
-	width: 130px;
-	height: 14px;
-	padding: 6px;
-	padding-right: 24px;
-}
-
-.ie8 #remote_address {
-	padding-right: 30px;
-}
-
-#save #save-button,
-#save #save-button-confirm {
-	margin: 0 5px;
-	height: 28px;
-	padding-bottom: 4px;
-	line-height: 14px;
+	width: 200px;
 }
 
 #save-button-confirm {
@@ -137,31 +138,9 @@ thead {
 	background-color: transparent;
 	border: none;
 	margin: 2px 4px !important;
-	right: 0;
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=50)";
-	filter: alpha(opacity=50);
-	opacity: .5;
-}
-
-.ie8 #save-button-confirm {
-	margin: 2px 0 !important;
-}
-
-#save-button-confirm:disabled,
-#save-button-confirm:disabled:hover,
-#save-button-confirm:disabled:focus {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=20)";
-	filter: alpha(opacity=20);
-	opacity: .2;
-	cursor: default;
-}
-
-#save-button-confirm:hover,
-#save-button-confirm:focus {
-	-ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)";
-	filter: alpha(opacity=100);
-	opacity: 1;
-	cursor: pointer;
+	right: 4px;
+	box-shadow: none;
+	height: 30px;
 }
 
 #public-upload .avatardiv {
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 32e4f3d3dd6..3bdaedae1cb 100644
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -58,13 +58,13 @@ $maxUploadFilesize = min($upload_max_filesize, $post_max_size);
 							  data-owner-display-name="<?php p($_['displayName']) ?>" data-owner="<?php p($_['owner']) ?>" data-name="<?php p($_['filename']) ?>">
 						<button id="save-button"><?php p($l->t('Add to your Nextcloud')) ?></button>
 						<form class="save-form hidden" action="#">
-							<input type="text" id="remote_address" placeholder="user@yourNextcloud.org"/>
+							<input type="email" id="remote_address" placeholder="user@yourNextcloud.org"/>
 							<button id="save-button-confirm" class="icon-confirm svg" disabled></button>
 						</form>
 					</span>
 					<?php } ?>
 					<a href="<?php p($_['downloadURL']); ?>" id="download" class="button">
-						<img class="svg" alt="" src="<?php print_unescaped(image_path("core", "actions/download.svg")); ?>"/>
+						<span class="icon icon-download"></span>
 						<span id="download-text"><?php p($l->t('Download'))?></span>
 					</a>
 				<?php } ?>
diff --git a/core/css/inputs.scss b/core/css/inputs.scss
index 7890d6ca802..98543f4d5e5 100644
--- a/core/css/inputs.scss
+++ b/core/css/inputs.scss
@@ -31,6 +31,7 @@ textarea,
 	outline: none;
 	border-radius: 3px;
 	&:not(:disabled):not(.primary) {
+		/* no border on quota */
 		&:not(#quota):hover,
 		&:focus,
 		&.active {
@@ -104,8 +105,7 @@ input {
 
 /* 'Click' inputs */
 select,
-button,
-.button,
+button, .button,
 input[type='button'],
 input[type='submit'],
 input[type='reset'] {
@@ -123,8 +123,7 @@ input[type='reset'] {
 }
 
 /* Buttons */
-button,
-.button,
+button, .button,
 input[type='button'],
 input[type='submit'],
 input[type='reset'] {
@@ -134,6 +133,17 @@ input[type='reset'] {
 		border: 0;
 	}
 }
+button, .button {
+	> span { 
+		/* icon position inside buttons */
+		&[class^='icon-'],
+		&[class*=' icon-'] {
+			display: inline-block;
+			vertical-align: text-bottom;
+		}
+	}
+}
+
 textarea {
 	color: #555;
 	cursor: text;