From 5c5a30fa793fead3bf57f98bbec03ea379aae213 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Fri, 23 Sep 2011 15:58:00 +0800 Subject: [PATCH 1/3] MDL-27793 Themes : fixed base (and other themes) theme's loginbox - fixed translated lengthy terms were being clipped - fixed clipping and positioning of loginbox in rtl and ltr languages both --- theme/afterburner/style/afterburner_styles.css | 5 +++++ theme/anomaly/style/general.css | 9 +++++++-- theme/base/style/core.css | 7 ++++--- theme/formal_white/style/core.css | 7 ++++++- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/theme/afterburner/style/afterburner_styles.css b/theme/afterburner/style/afterburner_styles.css index c03d7b2e72e..0cf664989e9 100644 --- a/theme/afterburner/style/afterburner_styles.css +++ b/theme/afterburner/style/afterburner_styles.css @@ -253,6 +253,11 @@ Course Section Topic & Weekly display: none; /* hides topic items title or weekly itens title */ margin-bottom: 9px; } +/*Login (Login page)*/ +.dir-rtl .loginbox .loginform .form-label {width:47%;} +.dir-ltr .loginbox .loginform .form-label {width:46%;} +.loginbox .loginform .form-input {width:53%;} + /* Login (Front Page) -----------------------*/ diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css index fc19a6d68e7..358d5e22d37 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -185,7 +185,12 @@ h1.headermain { margin-top: 15px; } -.loginbox .loginform .form-label { +.dir-rtl .loginbox .loginform .form-label { + width: 39%; + float: left; + text-align: right; +} +.dir-ltr .loginbox .loginform .form-label { width: 39%; float: left; text-align: right; @@ -835,4 +840,4 @@ h1.headermain { /* Add Block -------------------------*/ -.block .content .singleselect form#add_block .select.menubui_addblock { width: 160px;} \ No newline at end of file +.block .content .singleselect form#add_block .select.menubui_addblock { width: 160px;} diff --git a/theme/base/style/core.css b/theme/base/style/core.css index c7fed783488..cc8a988f631 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -272,7 +272,7 @@ input#id_externalurl {direction:ltr;} /** * Login */ -.loginbox {margin:15px;overflow:hidden;} +.loginbox {margin:15px;overflow:visible;} .loginbox.twocolumns {margin:15px;} .loginbox h2, .loginbox .subcontent {margin:5px;padding:10px;text-align:center;} @@ -285,8 +285,9 @@ input#id_externalurl {direction:ltr;} .loginbox .potentialidps .potentialidplist {margin-left:40%;} .loginbox .potentialidps .potentialidplist div {text-align:left;} .loginbox .loginform {margin-top:1em;text-align:left;} -.loginbox .loginform .form-label {float:left;text-align:right;width:40%;} -.loginbox .loginform .form-input {float:right;width:59%;} +.dir-rtl .loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:ltr; white-space:nowrap;} +.dir-ltr .loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:rtl; white-space:nowrap;} +.loginbox .loginform .form-input {float:right;width:55%;} .loginbox .loginform .form-input input {width: 6em;} .loginbox .signupform {margin-top:1em;text-align:center;} .loginbox.twocolumns .loginpanel {float:left;width:49.5%;border-right: 1px solid;margin-bottom:-2000px;padding-bottom:2000px;} diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css index 2e41f009e28..2c7c97ef3b4 100644 --- a/theme/formal_white/style/core.css +++ b/theme/formal_white/style/core.css @@ -110,7 +110,9 @@ input[type="radio"] { width: 50%; } -.loginbox .loginform .form-label { +.dir-ltr .loginbox .loginform .form-label { + float: none; + width: 100%; margin: 0 auto; float: left; text-align: right; @@ -118,6 +120,9 @@ input[type="radio"] { } .dir-rtl .loginbox .loginform .form-label { + float: none; + width: 100%; + margin: 0 auto; text-align: right; } From c5f2853d82b8955b9f84ef10a5cd28970c9090be Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Thu, 29 Sep 2011 14:38:09 +0800 Subject: [PATCH 2/3] MDL-27793 Themes : fixed "remember username" wrapping unnecessarily. --- login/index_form.html | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/login/index_form.html b/login/index_form.html index 3455a544fe1..1765064cd10 100644 --- a/login/index_form.html +++ b/login/index_form.html @@ -47,12 +47,14 @@ if (empty($CFG->xmlstrictheaders) and !empty($CFG->loginpasswordautocomplete)) { /> " /> +
rememberusername) and $CFG->rememberusername == 2) { ?> -
username) {echo 'checked="checked"';} ?> />
-
+
+ username) {echo 'checked="checked"';} ?> /> + +
-
From 7842fba0d7ca1be678ee9bdb0a6bd9ad957d3645 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Wed, 9 Nov 2011 14:38:14 +0800 Subject: [PATCH 3/3] MDL-27793 Themes : review changes - removed .dir-rtl from .loginbox selector rule to be default css rule. made them same width too. --- theme/afterburner/style/afterburner_styles.css | 4 ++-- theme/anomaly/style/general.css | 2 +- theme/base/style/core.css | 2 +- theme/formal_white/style/core.css | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/theme/afterburner/style/afterburner_styles.css b/theme/afterburner/style/afterburner_styles.css index 0cf664989e9..ab18d758d44 100644 --- a/theme/afterburner/style/afterburner_styles.css +++ b/theme/afterburner/style/afterburner_styles.css @@ -254,8 +254,8 @@ Course Section Topic & Weekly margin-bottom: 9px; } /*Login (Login page)*/ -.dir-rtl .loginbox .loginform .form-label {width:47%;} -.dir-ltr .loginbox .loginform .form-label {width:46%;} +.loginbox .loginform .form-label {width:46%;} +.dir-rtl .loginbox .loginform .form-label {width:46%;} .loginbox .loginform .form-input {width:53%;} /* diff --git a/theme/anomaly/style/general.css b/theme/anomaly/style/general.css index 358d5e22d37..59cb98326a2 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -185,7 +185,7 @@ h1.headermain { margin-top: 15px; } -.dir-rtl .loginbox .loginform .form-label { +.loginbox .loginform .form-label { width: 39%; float: left; text-align: right; diff --git a/theme/base/style/core.css b/theme/base/style/core.css index cc8a988f631..29322f24b63 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -285,8 +285,8 @@ input#id_externalurl {direction:ltr;} .loginbox .potentialidps .potentialidplist {margin-left:40%;} .loginbox .potentialidps .potentialidplist div {text-align:left;} .loginbox .loginform {margin-top:1em;text-align:left;} +.loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:rtl; white-space:nowrap;} .dir-rtl .loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:ltr; white-space:nowrap;} -.dir-ltr .loginbox .loginform .form-label {float:left;text-align:right;width:44%;direction:rtl; white-space:nowrap;} .loginbox .loginform .form-input {float:right;width:55%;} .loginbox .loginform .form-input input {width: 6em;} .loginbox .signupform {margin-top:1em;text-align:center;} diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css index 2c7c97ef3b4..9435a26341b 100644 --- a/theme/formal_white/style/core.css +++ b/theme/formal_white/style/core.css @@ -110,7 +110,7 @@ input[type="radio"] { width: 50%; } -.dir-ltr .loginbox .loginform .form-label { +.loginbox .loginform .form-label { float: none; width: 100%; margin: 0 auto;