diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/css/header.css | 4 | ||||
| -rw-r--r-- | core/css/styles.css | 36 | ||||
| -rw-r--r-- | core/js/login.js | 24 | ||||
| -rw-r--r-- | core/templates/login.php | 12 |
4 files changed, 64 insertions, 12 deletions
diff --git a/core/css/header.css b/core/css/header.css index 5630f96953f..369750251c4 100644 --- a/core/css/header.css +++ b/core/css/header.css @@ -70,8 +70,10 @@ } #header .logo { - background-image: url(../img/logo.svg); + background-image: url(../img/logo-icon.svg); background-repeat: no-repeat; + background-size: 175px; + background-position: center 30px; width: 252px; height: 120px; margin: 0 auto; diff --git a/core/css/styles.css b/core/css/styles.css index cad407b52ea..bf6ca519146 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -456,11 +456,30 @@ input[type="submit"].enabled { padding: 13px; margin: -13px; } -/* quick fix for log in button not being aligned with input fields, should be properly fixed by input field width later */ + +/* position log in button as confirm icon in right of password field */ #body-login #submit.login { - margin-right: 7px; + position: absolute; + right: 0; + top: 49px; + border: none; + background-color: transparent; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + opacity: .3; +} +#body-login #submit.login:hover, +#body-login #submit.login:focus { + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + opacity: .7; } +#body-login input[type="password"] { + padding-right: 40px; + box-sizing: border-box; + min-width: 269px; +} + #body-login form { + position: relative; width: 22em; margin: 2em auto 2em; padding: 0; @@ -539,10 +558,8 @@ input[name='password-clone'] { /* General new input field look */ #body-login input[type="text"], #body-login input[type="password"], -#body-login input[type="email"], -#body-login input[type="submit"] { +#body-login input[type="email"] { border: none; - border-radius: 5px; } /* Nicely grouping input field sets */ @@ -741,7 +758,7 @@ label.infield { margin: 35px auto; } #body-login .warning { - margin: 0 7px 5px; + margin: 0 7px 5px 4px; } #body-login .warning legend { -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; @@ -780,8 +797,13 @@ label.infield { padding: 10px 20px; /* larger log in and installation buttons */ } #remember_login { - margin: 24px 5px 0 16px !important; + margin: 18px 5px 0 16px !important; vertical-align: text-bottom; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=70)"; + opacity: .7; +} +#body-login .remember-login-container { + text-align: center; } /* Sticky footer */ diff --git a/core/js/login.js b/core/js/login.js new file mode 100644 index 00000000000..33ec868cb23 --- /dev/null +++ b/core/js/login.js @@ -0,0 +1,24 @@ +/** + * Copyright (c) 2015 + * Vincent Petry <pvince81@owncloud.com> + * Jan-Christoph Borchardt, http://jancborchardt.net + * This file is licensed under the Affero General Public License version 3 or later. + * See the COPYING-README file. + */ + +/** + * @namespace + * @memberOf OC + */ +OC.Login = _.extend(OC.Login || {}, { + onLogin: function () { + $('#submit') + .removeClass('icon-confirm') + .addClass('icon-loading-small') + .css('opacity', '1'); + return true; + } +}); +$(document).ready(function() { + $('form[name=login]').submit(OC.Login.onLogin); +}); diff --git a/core/templates/login.php b/core/templates/login.php index f942e02dc86..50ca6febf08 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -3,7 +3,8 @@ vendor_script('jsTimezoneDetect/jstz'); script('core', [ 'visitortimezone', - 'lostpassword' + 'lostpassword', + 'login' ]); ?> @@ -56,19 +57,22 @@ script('core', [ <img class="svg" id="password-icon" src="<?php print_unescaped(image_path('', 'actions/password.svg')); ?>" alt=""/> </p> + <input type="submit" id="submit" class="login primary icon-confirm" value="" disabled="disabled"/> + <?php if (isset($_['invalidpassword']) && ($_['invalidpassword'])): ?> <a id="lost-password" class="warning" href=""> <?php p($l->t('Wrong password. Reset it?')); ?> </a> <?php endif; ?> <?php if ($_['rememberLoginAllowed'] === true) : ?> - <input type="checkbox" name="remember_login" value="1" id="remember_login"> - <label for="remember_login"><?php p($l->t('remember')); ?></label> + <div class="remember-login-container"> + <input type="checkbox" name="remember_login" value="1" id="remember_login"> + <label for="remember_login"><?php p($l->t('remember')); ?></label> + </div> <?php endif; ?> <input type="hidden" name="timezone-offset" id="timezone-offset"/> <input type="hidden" name="timezone" id="timezone"/> <input type="hidden" name="requesttoken" value="<?php p($_['requesttoken']) ?>"> - <input type="submit" id="submit" class="login primary" value="<?php p($l->t('Log in')); ?>" disabled="disabled"/> </fieldset> </form> <?php if (!empty($_['alt_login'])) { ?> |