From d0e2a22e83d4ddbf5af0e4d3fa06a5d3dd1b643a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?=
<skjnldsv@protonmail.com>
Date: Fri, 16 Nov 2018 12:48:11 +0100
Subject: [PATCH] Fix login loader position and theming support
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
---
core/css/guest.css | 14 +++++++-------
core/js/login.js | 4 +++-
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/core/css/guest.css b/core/css/guest.css
index 5bc918db1e2..6a3b8c633e0 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -150,13 +150,18 @@ form #datadirField legend {
#submit-wrapper .submit-icon {
position: absolute;
- top: 23px;
- right: 23px;
+ height: 22px;
+ right: 24px;
+ top: 18px;
pointer-events: none; /* The submit icon is positioned on the submit button.
From the user point of view the icon is part of the
button, so the clicks on the icon have to be
applied to the button instead. */
}
+/* Properly position any loader */
+#submit-wrapper .submit-icon::after {
+ margin: -10px;
+}
#reset-password-submit {
padding: 10px;
@@ -168,11 +173,6 @@ form #datadirField legend {
display: none;
}
-#submit-wrapper .icon-loading-small {
- position: absolute;
- top: 22px;
- right: 24px;
-}
input, textarea, select, button, div[contenteditable=true] {
font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
diff --git a/core/js/login.js b/core/js/login.js
index 3447a5de724..64be29bfec6 100644
--- a/core/js/login.js
+++ b/core/js/login.js
@@ -17,7 +17,9 @@ OC.Login = _.extend(OC.Login || {}, {
if($('form[name=login][action]').length === 0) {
$('#submit-wrapper .submit-icon')
.removeClass('icon-confirm-white')
- .addClass('icon-loading-small-dark');
+ .addClass(OCA.Theming && OCA.Theming.inverted
+ ? 'icon-loading-small'
+ : 'icon-loading-small-dark');
$('#submit')
.attr('value', t('core', 'Logging in …'));
$('.login-additional').fadeOut();
--
GitLab