diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 16:08:48 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2015-09-21 16:08:48 +0200 |
| commit | ac8da41ccd3cea5190d42aebaf46ea8567887133 (patch) | |
| tree | 48d016dc54b6e2d81f7d913c81d0e163e3a55b7c /core | |
| parent | d8901cf7cd822b5c4323618527aafc687ee6c341 (diff) | |
| parent | 1d9128c557739bec9acfbbb07e48ac366e1b7faf (diff) | |
| download | nextcloud-server-ac8da41ccd3cea5190d42aebaf46ea8567887133.tar.gz nextcloud-server-ac8da41ccd3cea5190d42aebaf46ea8567887133.zip | |
Merge pull request #18709 from owncloud/cleanup-login-semantics
Pushes input inside the bottom group - login.
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/styles.css | 6 | ||||
| -rw-r--r-- | core/templates/login.php | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/core/css/styles.css b/core/css/styles.css index bc4db43301d..1a4a4ab4f3d 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -508,7 +508,7 @@ input[type="submit"].enabled { #body-login #submit.login { position: absolute; right: 0; - top: 49px; + top: 0; border: none; background-color: transparent; -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; @@ -527,8 +527,8 @@ input[type="submit"].enabled { #body-login form { position: relative; - width: 22em; - margin: 2em auto 2em; + width: 280px; + margin: 32px auto; padding: 0; } #body-login form fieldset { diff --git a/core/templates/login.php b/core/templates/login.php index 08c7768a432..2057b1034d0 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -55,10 +55,9 @@ script('core', [ autocomplete="on" autocapitalize="off" autocorrect="off" required> <label for="password" class="infield"><?php p($l->t('Password')); ?></label> <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> + <input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/> </p> - <input type="submit" id="submit" class="login primary icon-confirm" title="<?php p($l->t('Log in')); ?>" value="" disabled="disabled"/> - <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> <a id="lost-password" class="warning" href=""> <?php p($l->t('Wrong password. Reset it?')); ?> |