mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Fix login loader position and theming support
This commit is contained in:
Morris Jobke 2018-11-16 14:24:04 +01:00 committed by GitHub
parent 09efdfb4e6 d0e2a22e83
commit 0e5e28507a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/css/guest.css
View File

@ -150,13 +150,18 @@ form #datadirField legend {
#submit-wrapper .submit-icon { #submit-wrapper .submit-icon {
position: absolute; position: absolute;
top: 23px; height: 22px;
right: 23px; right: 24px;
top: 18px;
pointer-events: none; /* The submit icon is positioned on the submit button. pointer-events: none; /* The submit icon is positioned on the submit button.
From the user point of view the icon is part of the From the user point of view the icon is part of the
button, so the clicks on the icon have to be button, so the clicks on the icon have to be
applied to the button instead. */ applied to the button instead. */
} }
/* Properly position any loader */
#submit-wrapper .submit-icon::after {
margin: -10px;
}
#reset-password-submit { #reset-password-submit {
padding: 10px; padding: 10px;
@ -168,11 +173,6 @@ form #datadirField legend {
display: none; display: none;
} }
#submit-wrapper .icon-loading-small {
position: absolute;
top: 22px;
right: 24px;
}
input, textarea, select, button, div[contenteditable=true] { input, textarea, select, button, div[contenteditable=true] {
font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;

4
core/js/login.js
View File

@ -17,7 +17,9 @@ OC.Login = _.extend(OC.Login || {}, {
if($('form[name=login][action]').length === 0) { if($('form[name=login][action]').length === 0) {
$('#submit-wrapper .submit-icon') $('#submit-wrapper .submit-icon')
.removeClass('icon-confirm-white') .removeClass('icon-confirm-white')
.addClass('icon-loading-small-dark'); .addClass(OCA.Theming && OCA.Theming.inverted
? 'icon-loading-small'
: 'icon-loading-small-dark');
$('#submit') $('#submit')
.attr('value', t('core', 'Logging in …')); .attr('value', t('core', 'Logging in …'));
$('.login-additional').fadeOut(); $('.login-additional').fadeOut();