From c926e98ea96f4782bc75b97e4db5996dacd6e0d4 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 1 Apr 2014 17:18:03 +0200 Subject: [PATCH 1/5] fix log in input sizing caused by core input field switch to px --- core/css/styles.css | 42 +++++++++++++++++++++++++++++++----------- 1 file changed, 31 insertions(+), 11 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 8a12057529d..f750c72077c 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -402,14 +402,32 @@ input[type="submit"].enabled { } /* Icons for username and password fields to better recognize them */ -#adminlogin, #adminpass, #user, #password { width:11.7em!important; padding-left:1.8em; } -#adminlogin+label+img, #adminpass-icon, #user+label+img, #password-icon { - position:absolute; left:1.25em; top:1.65em; - -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; filter:alpha(opacity=30); opacity:.3; +#adminlogin, #adminpass, #user, #password { + width: 223px !important; + padding-left: 36px !important; +} +#adminlogin+label+img, +#adminpass-icon, +#user+label+img, +#password-icon { + position: absolute; + left: 1.25em; + top: 1.65em; + -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=30)"; + filter: alpha(opacity=30); + opacity: .3; +} +#adminpass-icon, #password-icon { + top: 1.1em; +} +input[name="password-clone"] { + padding-left: 1.8em; + width: 11.7em !important; +} +input[name="adminpass-clone"] { + padding-left: 1.8em; + width: 11.7em !important; } -#adminpass-icon, #password-icon { top:1.1em; } -input[name="password-clone"] { padding-left:1.8em; width:11.7em !important; } -input[name="adminpass-clone"] { padding-left:1.8em; width:11.7em !important; } /* General new input field look */ #body-login input[type="text"], @@ -456,7 +474,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login form input[type="checkbox"]+label { position: relative; margin: 0; - font-size: 1em; + font-size: 13px; padding: 14px; padding-left: 28px; margin-left: -28px; @@ -610,11 +628,13 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } /* Log in and install button */ #body-login input { - font-size: 1.5em; + font-size: 20px; + margin: 5px; + padding: 12px 10px 8px; } #body-login input[type="text"], #body-login input[type="password"] { - width: 13em; + width: 249px; } #body-login input.login { width: auto; @@ -624,7 +644,7 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } padding: 10px 20px; /* larger log in and installation buttons */ } #remember_login { - margin: 18px 5px 0 18px; + margin: 24px 5px 0 16px !important; vertical-align: text-bottom; } From 0c441724bc3031e50715169e9fd5541b347b2878 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Tue, 1 Apr 2014 17:21:05 +0200 Subject: [PATCH 2/5] make infield labels use less space so pasting in is easier --- core/css/styles.css | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index f750c72077c..7af80e31ffb 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -466,9 +466,14 @@ input[name="adminpass-clone"] { p.infield { position:relative; } label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login form label.infield { /* labels are ellipsized when too long, keep them short */ - position:absolute; width:90%; padding-left:1.4em; - font-size:19px; color:#aaa; - white-space:nowrap; overflow:hidden; text-overflow:ellipsis; + position: absolute; + width: auto; + margin-left: 26px; + font-size: 19px; + color: #aaa; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; } #body-login #databaseField .infield { padding-left:0; } #body-login form input[type="checkbox"]+label { From 6a79b7f2b56b81f2800debf966beed5d5d7c7223 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 16 Apr 2014 17:43:15 +0200 Subject: [PATCH 3/5] fix sizing for fields when password is shown --- core/css/styles.css | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/core/css/styles.css b/core/css/styles.css index 7af80e31ffb..477b4263cad 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -402,7 +402,12 @@ input[type="submit"].enabled { } /* Icons for username and password fields to better recognize them */ -#adminlogin, #adminpass, #user, #password { +#adminlogin, +#adminpass, +input[name='adminpass-clone'], +#user, +#password, +input[name='password-clone'] { width: 223px !important; padding-left: 36px !important; } @@ -420,14 +425,6 @@ input[type="submit"].enabled { #adminpass-icon, #password-icon { top: 1.1em; } -input[name="password-clone"] { - padding-left: 1.8em; - width: 11.7em !important; -} -input[name="adminpass-clone"] { - padding-left: 1.8em; - width: 11.7em !important; -} /* General new input field look */ #body-login input[type="text"], From 067a5cdee734ace6628b93a82c23f61fe1245db3 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 16 Apr 2014 17:44:05 +0200 Subject: [PATCH 4/5] fix database infield label indentation --- core/css/styles.css | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 477b4263cad..5efa7707836 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -472,7 +472,9 @@ label.infield { cursor:text !important; top:1.05em; left:.85em; } overflow: hidden; text-overflow: ellipsis; } -#body-login #databaseField .infield { padding-left:0; } +#body-login #databaseField .infield { + margin-left: 0; +} #body-login form input[type="checkbox"]+label { position: relative; margin: 0; From 03ad908c30e44c9b4776f8f9d8e83931e6f3fbd8 Mon Sep 17 00:00:00 2001 From: Jan-Christoph Borchardt Date: Wed, 16 Apr 2014 17:44:38 +0200 Subject: [PATCH 5/5] fix overlapping infield labels --- core/css/styles.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/css/styles.css b/core/css/styles.css index 5efa7707836..af817ead034 100644 --- a/core/css/styles.css +++ b/core/css/styles.css @@ -464,7 +464,7 @@ p.infield { position:relative; } label.infield { cursor:text !important; top:1.05em; left:.85em; } #body-login form label.infield { /* labels are ellipsized when too long, keep them short */ position: absolute; - width: auto; + width: 82%; margin-left: 26px; font-size: 19px; color: #aaa;