Bladeren bron

Fix login loader position and theming support

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
tags/v15.0.0RC1
John Molakvoæ (skjnldsv) 5 jaren geleden
bovenliggende
commit
d0e2a22e83
No account linked to committer's email address
2 gewijzigde bestanden met toevoegingen van 10 en 8 verwijderingen
  1. 7
    7
      core/css/guest.css
  2. 3
    1
      core/js/login.js

+ 7
- 7
core/css/guest.css Bestand weergeven

@@ -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;

+ 3
- 1
core/js/login.js Bestand weergeven

@@ -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();

Laden…
Annuleren
Opslaan