From 3ea819e261c4cf17e3a5610c81ef2ad6c89c2da6 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 29 Jun 2017 16:35:39 +0200 Subject: [PATCH 1/3] Add box around link share password box, fix #5560 Signed-off-by: Jan-Christoph Borchardt --- apps/files_sharing/templates/authenticate.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php index fbc1d72a33..d9f19bbb57 100644 --- a/apps/files_sharing/templates/authenticate.php +++ b/apps/files_sharing/templates/authenticate.php @@ -5,7 +5,7 @@ script('files_sharing', 'authenticate'); ?>
-
+
t('This share is password-protected')); ?>
From 23a08c501ac5d0311507dc18630fad595b1d9728 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Thu, 29 Jun 2017 16:36:08 +0200 Subject: [PATCH 2/3] Move link share password box and button together Signed-off-by: Jan-Christoph Borchardt --- apps/files_sharing/css/authenticate.css | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css index 16687916ac..89bdafa773 100644 --- a/apps/files_sharing/css/authenticate.css +++ b/apps/files_sharing/css/authenticate.css @@ -1,12 +1,15 @@ #password { - padding: 10px; - margin: 6px; + margin-right: 0 !important; + border-top-right-radius: 0; + border-bottom-right-radius: 0; } input[type='submit'] { width: 45px; height: 45px; - margin: 6px; + margin-left: 0 !important; + border-top-left-radius: 0; + border-bottom-left-radius: 0; } fieldset > p { From 4faa5624030e7b8b74aae74534f4cd818da4fa0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Mon, 18 Sep 2017 07:22:25 +0200 Subject: [PATCH 3/3] Fix browser width compatibility MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/css/authenticate.css | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/apps/files_sharing/css/authenticate.css b/apps/files_sharing/css/authenticate.css index 89bdafa773..9b2d676928 100644 --- a/apps/files_sharing/css/authenticate.css +++ b/apps/files_sharing/css/authenticate.css @@ -1,7 +1,16 @@ +form fieldset { + display: flex !important; + flex-direction: column; +} + #password { margin-right: 0 !important; border-top-right-radius: 0; border-bottom-right-radius: 0; + height: 45px; + flex: 1 1 auto; + width: 100% !important; + min-width: 0; /* FF hack for to override default value */ } input[type='submit'] { @@ -13,7 +22,5 @@ input[type='submit'] { } fieldset > p { - position: relative; - display: flex; - align-items: center; + display: inline-flex; }