From 068f1d28f3fd3a97c2c5abfd408dec8e0d0cbcd7 Mon Sep 17 00:00:00 2001 From: ochorocho Date: Mon, 26 Aug 2019 20:01:44 +0200 Subject: Move alternative login above standard login, optimize alignment Signed-off-by: ochorocho --- core/css/guest.css | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) (limited to 'core/css') diff --git a/core/css/guest.css b/core/css/guest.css index 4d7df8b8996..6553dbd48ee 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; -- cgit v1.2.3 From dc30ffc1e5170ab1af1c407cbdaf43d8e2beab41 Mon Sep 17 00:00:00 2001 From: Jochen Date: Mon, 2 Sep 2019 17:50:56 +0200 Subject: 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(-) (limited to 'core/css') diff --git a/core/css/guest.css b/core/css/guest.css index 6553dbd48ee..c238c3a8e25 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 8a426b492eb..10d5087fd04 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -3,12 +3,16 @@ script('core', 'dist/login'); ?> - -
- - - -
-
+ + + + -- cgit v1.2.3 From e710976b9991969f7cde69f9d5483cd53062e05a Mon Sep 17 00:00:00 2001 From: Jochen Date: Tue, 3 Sep 2019 22:44:31 +0200 Subject: 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(-) (limited to 'core/css') diff --git a/core/css/guest.css b/core/css/guest.css index c238c3a8e25..cb53b0e513a 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 10d5087fd04..eeeb38d9fc9 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -3,13 +3,12 @@ script('core', 'dist/login'); ?> -
- + t('Log in with')) ?> -- cgit v1.2.3 From a9b942cbbe7ad78f7ebf90744203e7c18c64975b Mon Sep 17 00:00:00 2001 From: Jochen Date: Wed, 4 Sep 2019 21:01:21 +0200 Subject: Add default style for alternative login Signed-off-by: Jochen --- core/css/guest.css | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'core/css') diff --git a/core/css/guest.css b/core/css/guest.css index cb53b0e513a..4881dca1588 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 { -- cgit v1.2.3 From ba8acfe2d49e511fe8f3948d78325987bde37cd3 Mon Sep 17 00:00:00 2001 From: Jochen Date: Fri, 6 Sep 2019 20:02:19 +0200 Subject: 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(-) (limited to 'core/css') diff --git a/core/css/guest.css b/core/css/guest.css index 4881dca1588..1f12fd69b0a 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 c5ef765106a..9635de2a61d 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -8,8 +8,8 @@ script('core', 'dist/login'); -- cgit v1.2.3 From dff16b60c80989f1e979b42cbc304a52c2d82413 Mon Sep 17 00:00:00 2001 From: Jochen Date: Sat, 7 Sep 2019 23:25:42 +0200 Subject: 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(-) (limited to 'core/css') diff --git a/core/css/guest.css b/core/css/guest.css index 1f12fd69b0a..4cfca9cc6dd 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; - } } -- cgit v1.2.3