From fb5bbc1d428e39f8f21202e5b747834134ddddf7 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Tue, 10 Jan 2012 01:21:22 +0000 Subject: [PATCH] MDL-29724-update login page layout for all themes --- theme/arialist/config.php | 2 +- theme/arialist/style/pagelayout.css | 20 ++---- theme/canvas/style/core.css | 94 ----------------------------- theme/splash/style/sl.css | 23 ++++--- 4 files changed, 20 insertions(+), 119 deletions(-) diff --git a/theme/arialist/config.php b/theme/arialist/config.php index a469b5a3fd8..751523c85fb 100644 --- a/theme/arialist/config.php +++ b/theme/arialist/config.php @@ -54,8 +54,8 @@ $THEME->parents = array( $THEME->sheets = array( + 'pagelayout', 'core', - 'pagelayout', 'settings', ); diff --git a/theme/arialist/style/pagelayout.css b/theme/arialist/style/pagelayout.css index 5c8249c4bb9..dbaf4850a08 100644 --- a/theme/arialist/style/pagelayout.css +++ b/theme/arialist/style/pagelayout.css @@ -75,29 +75,19 @@ body { width: 100%; } - .has_dock.side-post-only .page-middle #region-main { margin-left: 200px; } /** No blocks whatsoever **/ -.content-only #page-content #region-main-box { +.content-only #page-content #region-main-box, +.content-only #page-content #region-main-box #region-post-box, +.content-only #page-content #region-main-box #region-main-wrap #region-main { margin-left: 0px; } -.content-only #page-content #region-post-box { - margin-left: 0px; -} - -.content-only #page-content #region-main { - margin-left: 0px; -} - -.content-only #page-content #region-pre { - width: 0px; -} - -.content-only #page-content #region-post { +.content-only #page-content #region-main-box #region-post-box #region-pre, +.content-only #page-content #region-main-box #region-post-box #region-post { width: 0px; } diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css index f763f971401..b1e5f481a26 100644 --- a/theme/canvas/style/core.css +++ b/theme/canvas/style/core.css @@ -81,100 +81,6 @@ input[type="radio"] { margin-right: 7px; } -/* Login --------------------------*/ - -.loginbox { - margin: 15px 25%; -} - -.loginbox .loginerrors { - color: #f00; -} - -.loginbox .loginform { - margin: 15px auto 0; - width: 175px; -} - -.loginbox .loginform .form-label { - float: none; - width: 100%; - margin: 0 auto; - text-align: left; -} -.dir-rtl .loginbox .loginform .form-label { - text-align: right; -} -.loginbox .loginform .form-input { - float: none; - width: 100%; - margin: 0 auto; -} - -.loginbox .loginform .form-input #username, -.loginbox .loginform .form-input #password { - width: 97%; - padding: 3px; - font-size: 1.1em; - font-family: Helvetica, Arial, sans-serif; - border: 2px solid #ddd; - margin: 0 0 5px; - color: #333; -} - -.loginbox .loginform .form-input #loginbtn { - margin: 0.5em auto; -} - -.loginbox .forgetpass { - margin: 1em 0 0; - font-size: 0.95em; -} - -.loginbox.twocolumns { - width: 90%; - margin-left: 5%; -} - -.loginbox .guestsub { - border-top: 1px solid #DDDDDD; - margin: 5px 20% -} - -.loginbox.twocolumns .loginpanel { - border-color: #ddd; - padding-right: 0.5%; -} - -.loginbox.twocolumns .signuppanel { - padding-left: 1%; - width: 48%; -} - -#page-course-loginas #notice { - border: none; -} - -#page-login-forgot_password .generalbox { - margin: 0 auto 1.5em; - width: 75%; - padding: 10px; -} - -#page-login-signup .mform { - width: 85%; - margin: 0 auto; -} - -#page-login-signup .mform .fitem .fitemtitle { - width: 20%; -} - -#page-login-signup .mform .fitem .felement { - margin-left: 21%; -} - /* Calendar -------------------------*/ diff --git a/theme/splash/style/sl.css b/theme/splash/style/sl.css index eadc4ff8634..2f4e50a457e 100644 --- a/theme/splash/style/sl.css +++ b/theme/splash/style/sl.css @@ -7,7 +7,7 @@ ** *********************************************************/ -/* Global +/* Global ------------------------*/ html { /* Reset html page to 0 padding/margins */ padding: 0; @@ -22,7 +22,7 @@ body { /* Define margins and background colour/image */ width: 100%; } -body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { /* Set fonttype for site */ +body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { /* Set fonttype for site */ font-family: "Helvetica Neue", Helvetica, Arial, sans-serif; } @@ -58,9 +58,14 @@ a:active { display: none; } -.loginpanel { - background: url([[pix:theme|loginpanel]]) top center no-repeat; +.loginbox.twocolumns .loginpanel { + border-right: 1px solid #ddd; +} + +.loginpanel, .signuppanel { + background: url([[pix:theme|loginpanel]]) center top no-repeat; height: 480px; + margin-top: -5px; } .loginbox .loginpanel .subcontent { @@ -68,12 +73,12 @@ a:active { clear: right; width: 300px; } -/* fix issues conflicting with the floating columns */ +/* fix issues conflicting with the floating columns */ .clearer { clear:left; } -/* Header +/* Header -----------------------*/ #page-header { /* Set height for header */ @@ -151,7 +156,7 @@ a:active { height: 60px; } -#userdetails_loggedout h1{ /* positioning of user h1 tag*/ +#userdetails_loggedout h1{ /* positioning of user h1 tag*/ padding-top:40px } @@ -462,11 +467,11 @@ div.summary { /* Mini Calendar ------------------------*/ -.block .minicalendar { /* setting background colour for mini cal*/ +.block .minicalendar { /* setting background colour for mini cal*/ background: #fff; } -.block .minicalendar td.weekend { /* setting weekend date colour */ +.block .minicalendar td.weekend { /* setting weekend date colour */ color:#7c3041; }