From a1fc9592a310f3cea5bfaab3912ccef514176204 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Fri, 23 Sep 2011 15:58:00 +0800 Subject: [PATCH 1/2] 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 | 8 +++++++- theme/base/style/core.css | 7 ++++--- theme/canvas/style/core.css | 6 ++++++ theme/formal_white/style/core.css | 5 ++++- 5 files changed, 26 insertions(+), 5 deletions(-) diff --git a/theme/afterburner/style/afterburner_styles.css b/theme/afterburner/style/afterburner_styles.css index 6c1b5bd523ab2..169dbda78776a 100644 --- a/theme/afterburner/style/afterburner_styles.css +++ b/theme/afterburner/style/afterburner_styles.css @@ -247,6 +247,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 da2501e5fdeba..383289418ad10 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -165,7 +165,13 @@ html, body { 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; diff --git a/theme/base/style/core.css b/theme/base/style/core.css index 8dac1406d1572..7b07afbc9e0aa 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -268,7 +268,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;} @@ -281,8 +281,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/canvas/style/core.css b/theme/canvas/style/core.css index 0431db18e23e6..9b33b7824e465 100644 --- a/theme/canvas/style/core.css +++ b/theme/canvas/style/core.css @@ -105,6 +105,12 @@ input[type="radio"] { } .dir-rtl .loginbox .loginform .form-label { text-align: right; + direction: rtl; +} + +.dir-ltr .loginbox .loginform .form-label { + text-align: left; + direction: ltr; } .loginbox .loginform .form-input { float: none; diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css index 44e2b7ef89bca..0326d53494fb3 100644 --- a/theme/formal_white/style/core.css +++ b/theme/formal_white/style/core.css @@ -110,7 +110,7 @@ input[type="radio"] { width: 50%; } -.loginbox .loginform .form-label { +.dir-ltr .loginbox .loginform .form-label { float: none; width: 100%; margin: 0 auto; @@ -118,6 +118,9 @@ input[type="radio"] { } .dir-rtl .loginbox .loginform .form-label { + float: none; + width: 100%; + margin: 0 auto; text-align: right; } From b861cf6a3d47d7846e1b346bfd553a5ae0d4bbd7 Mon Sep 17 00:00:00 2001 From: Aparup Banerjee Date: Wed, 9 Nov 2011 14:38:14 +0800 Subject: [PATCH 2/2] 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/canvas/style/core.css | 2 +- theme/formal_white/style/core.css | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/theme/afterburner/style/afterburner_styles.css b/theme/afterburner/style/afterburner_styles.css index 169dbda78776a..5e2cddbb3a205 100644 --- a/theme/afterburner/style/afterburner_styles.css +++ b/theme/afterburner/style/afterburner_styles.css @@ -248,8 +248,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 383289418ad10..c339f47f55600 100644 --- a/theme/anomaly/style/general.css +++ b/theme/anomaly/style/general.css @@ -165,7 +165,7 @@ html, body { 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 7b07afbc9e0aa..1bf2ee47d538a 100644 --- a/theme/base/style/core.css +++ b/theme/base/style/core.css @@ -281,8 +281,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/canvas/style/core.css b/theme/canvas/style/core.css index 9b33b7824e465..490a811fb9cd7 100644 --- a/theme/canvas/style/core.css +++ b/theme/canvas/style/core.css @@ -108,7 +108,7 @@ input[type="radio"] { direction: rtl; } -.dir-ltr .loginbox .loginform .form-label { +.loginbox .loginform .form-label { text-align: left; direction: ltr; } diff --git a/theme/formal_white/style/core.css b/theme/formal_white/style/core.css index 0326d53494fb3..a571eb588557f 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;