diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2016-10-17 18:28:27 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-17 18:28:27 +0200 |
| commit | cf5d30387b20e74304e4d28f709b928c3cb231c9 (patch) | |
| tree | 35151367f4edecb0c4e5ad9b512da0c2b37cf915 /core/css | |
| parent | 6375790263c5fadc72e48c9486b06b28d9e805cb (diff) | |
| parent | aa4eaf3a7e66a144d2f841e9ed7cc7e713e41bff (diff) | |
| download | nextcloud-server-cf5d30387b20e74304e4d28f709b928c3cb231c9.tar.gz nextcloud-server-cf5d30387b20e74304e4d28f709b928c3cb231c9.zip | |
Merge pull request #1641 from nextcloud/log-in-button
bring back dedicated log in button to make log in more usable
Diffstat (limited to 'core/css')
| -rw-r--r-- | core/css/icons.css | 5 | ||||
| -rw-r--r-- | core/css/styles.css | 40 |
2 files changed, 17 insertions, 28 deletions
diff --git a/core/css/icons.css b/core/css/icons.css index 50dcf51fd3a..df36ae58710 100644 --- a/core/css/icons.css +++ b/core/css/icons.css @@ -147,7 +147,10 @@ img.icon-loading-small-dark, object.icon-loading-small-dark, video.icon-loading- } .icon-confirm { - background-image: url('../img/actions/confirm.svg?v=1'); + background-image: url('../img/actions/confirm.svg?v=2'); +} +.icon-confirm-white { + background-image: url('../img/actions/confirm-white.svg?v=2'); } .icon-delete, diff --git a/core/css/styles.css b/core/css/styles.css index 958a93a600c..8fa7691ca7a 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -286,32 +286,10 @@ body { margin: -13px; } -/* position log in button as confirm icon in right of password field */ -#body-login #submit.login { - position: absolute; - right: 0; - top: 0; - 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"], -#body-login input[name="adminpass-clone"] { - padding-right: 40px; - box-sizing: border-box; - min-width: 269px; -} - #body-login form { position: relative; width: 280px; - margin: 32px auto; + margin: 16px auto; padding: 0; } #body-login form fieldset { @@ -420,7 +398,6 @@ label.infield { position: relative; margin: 0; padding: 14px; - padding-left: 28px; vertical-align: middle; -webkit-user-select: none; -moz-user-select: none; @@ -442,6 +419,8 @@ label.infield { #body-login #remember_login:hover+label, #body-login #remember_login:focus+label, +#body-login #forgot-password:hover, +#body-login #forgot-password:focus, #body-login p.info a:hover, #body-login p.info a:focus { opacity: .6; @@ -617,8 +596,8 @@ label.infield { width: 249px; } #body-login input.login { - width: auto; - float: right; + width: 269px; + background-position: right 16px center; } #body-login input[type="submit"] { padding: 10px 20px; /* larger log in and installation buttons */ @@ -627,8 +606,15 @@ label.infield { margin: 18px 5px 0 16px !important; } #body-login .remember-login-container { - margin-top: 10px; + display: inline-block; + margin: 10px 0; text-align: center; + width: 100%; +} +#body-login #forgot-password { + padding: 11px; + float: right; + color: #fff; } /* Sticky footer */ |