From 068f1d28f3fd3a97c2c5abfd408dec8e0d0cbcd7 Mon Sep 17 00:00:00 2001 From: ochorocho Date: Mon, 26 Aug 2019 20:01:44 +0200 Subject: [PATCH 01/12] Move alternative login above standard login, optimize alignment Signed-off-by: ochorocho --- core/css/guest.css | 26 +++++++++++++++++++++++++- core/templates/login.php | 19 ++++++++----------- 2 files changed, 33 insertions(+), 12 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 4d7df8b899..6553dbd48e 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -95,6 +95,7 @@ body { max-width: 100%; max-height: 200px; } + .wrapper { width: 300px; margin-top: 10vh; @@ -143,7 +144,8 @@ form #datadirField legend { /* Buttons and input */ #submit-wrapper, -#reset-password-wrapper { +#reset-password-wrapper, +#alternative-logins { display: flex; align-items: center; justify-content: center; @@ -151,6 +153,28 @@ form #datadirField legend { absolutely positioned descendant icons */ } +#alternative-logins { + margin: 10px 15px 20px; + display: block; +} + +#alternative-logins a { + margin: 5px; + display: block; + font-size: 15px; +} + + +@media only screen and (max-width: 1024px) { + .wrapper { + margin-top: 0; + } + #alternative-logins { + margin: 0px 15px 10px; + } +} + + #submit-wrapper .submit-icon, #reset-password-wrapper .submit-icon { position: absolute; diff --git a/core/templates/login.php b/core/templates/login.php index 548216d462..8a426b492e 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -3,15 +3,12 @@ script('core', 'dist/login'); ?> -
-
-
-
    - -
    • - -
-
-
- + + + + + + +
From dc30ffc1e5170ab1af1c407cbdaf43d8e2beab41 Mon Sep 17 00:00:00 2001 From: Jochen Date: Mon, 2 Sep 2019 17:50:56 +0200 Subject: [PATCH 02/12] Add more space to buttonsy Signed-off-by: Jochen --- core/css/guest.css | 2 +- core/templates/login.php | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 6553dbd48e..c238c3a8e2 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -159,7 +159,7 @@ form #datadirField legend { } #alternative-logins a { - margin: 5px; + margin: 10px 5px; display: block; font-size: 15px; } diff --git a/core/templates/login.php b/core/templates/login.php index 8a426b492e..10d5087fd0 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -3,12 +3,16 @@ script('core', 'dist/login'); ?> - -
- - - -
-
+ + + + From e710976b9991969f7cde69f9d5483cd53062e05a Mon Sep 17 00:00:00 2001 From: Jochen Date: Tue, 3 Sep 2019 22:44:31 +0200 Subject: [PATCH 03/12] Add more space between form and alternate login Signed-off-by: Jochen --- core/css/guest.css | 4 ++-- core/templates/login.php | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index c238c3a8e2..cb53b0e513 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -154,7 +154,7 @@ form #datadirField legend { } #alternative-logins { - margin: 10px 15px 20px; + margin: 30px 15px 20px; display: block; } @@ -170,7 +170,7 @@ form #datadirField legend { margin-top: 0; } #alternative-logins { - margin: 0px 15px 10px; + margin: 30px 15px 10px; } } diff --git a/core/templates/login.php b/core/templates/login.php index 10d5087fd0..eeeb38d9fc 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -3,13 +3,12 @@ script('core', 'dist/login'); ?> -
- + t('Log in with')) ?> From a9b942cbbe7ad78f7ebf90744203e7c18c64975b Mon Sep 17 00:00:00 2001 From: Jochen Date: Wed, 4 Sep 2019 21:01:21 +0200 Subject: [PATCH 04/12] Add default style for alternative login Signed-off-by: Jochen --- core/css/guest.css | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/core/css/guest.css b/core/css/guest.css index cb53b0e513..4881dca158 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -164,6 +164,17 @@ form #datadirField legend { font-size: 15px; } +#alternative-logins a::before { + content: ""; + background-repeat: no-repeat; + background-size: contain; + width: 18px; + height: 18px; + display: inline-block; + vertical-align: bottom; + margin-right: 5px; +} + @media only screen and (max-width: 1024px) { .wrapper { From c6b660099a92ff332e1b3aa924a0a49866eb0a79 Mon Sep 17 00:00:00 2001 From: Jochen Date: Thu, 5 Sep 2019 19:16:17 +0200 Subject: [PATCH 05/12] Move "Log in with" label to "sociallogin" app https://github.com/nextcloud/server/pull/16832#issuecomment-528197965 Signed-off-by: Jochen --- core/templates/login.php | 1 - 1 file changed, 1 deletion(-) diff --git a/core/templates/login.php b/core/templates/login.php index eeeb38d9fc..0039deb591 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -9,7 +9,6 @@ script('core', 'dist/login');
- t('Log in with')) ?> From a1c83c12d01390face86ac7114d3932e10cb5ace Mon Sep 17 00:00:00 2001 From: Jochen Date: Thu, 5 Sep 2019 19:20:32 +0200 Subject: [PATCH 06/12] Prevent undefined for $login['style'] https://github.com/nextcloud/server/pull/16832#discussion_r321075261 Signed-off-by: Jochen --- core/templates/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/login.php b/core/templates/login.php index 0039deb591..c5ef765106 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,7 +8,7 @@ script('core', 'dist/login');
- + From ba8acfe2d49e511fe8f3948d78325987bde37cd3 Mon Sep 17 00:00:00 2001 From: Jochen Date: Fri, 6 Sep 2019 20:02:19 +0200 Subject: [PATCH 07/12] Optimize responsiveness, remove primary class Signed-off-by: Jochen --- core/css/guest.css | 27 +++++++++++++++++++++------ core/templates/login.php | 4 ++-- 2 files changed, 23 insertions(+), 8 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 4881dca158..1f12fd69b0 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -97,20 +97,19 @@ body { } .wrapper { - width: 300px; + max-width: 100%; margin-top: 10vh; } /* Default FORM */ form { position: relative; - width: 280px; margin: auto; padding: 0; } form fieldset { - margin-bottom: 20px; - text-align: left; + width: 260px; + margin: auto auto 20px; -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; @@ -156,25 +155,34 @@ form #datadirField legend { #alternative-logins { margin: 30px 15px 20px; display: block; + min-width: 260px; + max-width: 400px; + overflow: hidden; } #alternative-logins a { margin: 10px 5px; display: block; font-size: 15px; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #alternative-logins a::before { content: ""; background-repeat: no-repeat; background-size: contain; - width: 18px; + width: 0; height: 18px; display: inline-block; vertical-align: bottom; - margin-right: 5px; } +#alternative-logins .button { + color: #0082c9; + padding: 12px 20px; +} @media only screen and (max-width: 1024px) { .wrapper { @@ -183,6 +191,9 @@ form #datadirField legend { #alternative-logins { margin: 30px 15px 10px; } + #alternative-logins .label-prefix { + display: none; + } } @@ -198,6 +209,10 @@ form #datadirField legend { applied to the button instead. */ } +#submit-wrapper { + margin: 0 auto; +} + #submit-wrapper input.login:hover ~ .submit-icon.icon-confirm-white, #submit-wrapper input.login:focus ~ .submit-icon.icon-confirm-white, #submit-wrapper input.login:active ~ .submit-icon.icon-confirm-white { diff --git a/core/templates/login.php b/core/templates/login.php index c5ef765106..9635de2a61 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,8 +8,8 @@ script('core', 'dist/login'); From dff16b60c80989f1e979b42cbc304a52c2d82413 Mon Sep 17 00:00:00 2001 From: Jochen Date: Sat, 7 Sep 2019 23:25:42 +0200 Subject: [PATCH 08/12] Hide only icons for buttons https://github.com/nextcloud/server/pull/16832#issuecomment-529115417 Signed-off-by: Jochen --- core/css/guest.css | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/css/guest.css b/core/css/guest.css index 1f12fd69b0..4cfca9cc6d 100644 --- a/core/css/guest.css +++ b/core/css/guest.css @@ -169,11 +169,12 @@ form #datadirField legend { text-overflow: ellipsis; } -#alternative-logins a::before { +#alternative-logins a.button::before { content: ""; background-repeat: no-repeat; background-size: contain; width: 0; + margin-right: 0; height: 18px; display: inline-block; vertical-align: bottom; @@ -191,9 +192,6 @@ form #datadirField legend { #alternative-logins { margin: 30px 15px 10px; } - #alternative-logins .label-prefix { - display: none; - } } From d38f8dc746cc94feb3422704fe9228a3bd5c8893 Mon Sep 17 00:00:00 2001 From: Jochen Date: Mon, 9 Sep 2019 19:00:32 +0200 Subject: [PATCH 09/12] Add aria label Signed-off-by: Jochen --- core/templates/login.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/templates/login.php b/core/templates/login.php index 9635de2a61..b6583f70ac 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,8 +8,8 @@ script('core', 'dist/login'); From 493a756f3bb119ba365dbe26a0ae8e699d02feda Mon Sep 17 00:00:00 2001 From: Jochen Date: Mon, 9 Sep 2019 20:25:16 +0200 Subject: [PATCH 10/12] Add null coalesce for label and style attribute https://github.com/nextcloud/server/pull/16832#discussion_r322380822 Signed-off-by: Jochen --- core/templates/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/login.php b/core/templates/login.php index b6583f70ac..4daae2cb96 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,7 +8,7 @@ script('core', 'dist/login');
- + From e0ee53a5f0f859514c6fa985f4c22ef218503a3c Mon Sep 17 00:00:00 2001 From: Jochen Date: Mon, 9 Sep 2019 20:31:08 +0200 Subject: [PATCH 11/12] Added name as fallback, in case label is not set https://github.com/nextcloud/server/pull/16832#discussion_r322380822 Signed-off-by: Jochen --- core/templates/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/login.php b/core/templates/login.php index 4daae2cb96..e088ac3991 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,7 +8,7 @@ script('core', 'dist/login');
- + From e2df446ca4cd73e4f9b3f2c3af98ea17b270423e Mon Sep 17 00:00:00 2001 From: Jochen Date: Tue, 10 Sep 2019 20:29:13 +0200 Subject: [PATCH 12/12] Remove aria label https://github.com/nextcloud/server/pull/16832#discussion_r322078592 Signed-off-by: Jochen --- core/templates/login.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/templates/login.php b/core/templates/login.php index e088ac3991..9c6a81fe1e 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,7 +8,7 @@ script('core', 'dist/login');