Merge pull request #12483 from nextcloud/fix-login-loader

Fix login loader position and theming support
nextcloud · Nov 16, 2018 · 0e5e285 · 0e5e285
2 parents 09efdfb + d0e2a22
commit 0e5e285
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git 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
@@ -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();