From df7962f9776900d3560fb08b320c62309b35c8a2 Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Mon, 30 May 2011 00:12:27 +0100 Subject: [PATCH] wip-MDL-25512 Correct CSS rules in Canvas theme to align with YUI3 CSS Fonts --- theme/canvas/style/core.css | 514 ++++++++++++++++++++---------------- theme/canvas/style/text.css | 115 ++++---- 2 files changed, 341 insertions(+), 288 deletions(-) diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css index 64616ecd0db..9c37f848761 100644 --- a/theme/canvas/style/core.css +++ b/theme/canvas/style/core.css @@ -1,25 +1,30 @@ html { - height: 100%; + height: 100%; } body { - min-height: 100%; - margin: 0; - padding: 0; + min-height: 100%; + margin: 0; + padding: 0; +} + +#page { + font-size: 85%; + line-height: 1.4; } .sitetopic { - border: none; + border: none; } .headingblock { - border-bottom: 1px solid #ddd; - font-size: 1.3em; - color: #333; + border-bottom: 1px solid #ddd; + font-size: 1.3em; + color: #333; } #notice { - text-align: center; + text-align: center; } .noticebox, @@ -32,293 +37,293 @@ body { .singlebutton, .buttons, .singleselect { - text-align: center; - margin: 1em 0; + text-align: center; + margin: 1em 0; } .navbutton .singlebutton { - margin: 0; + margin: 0; } .generalbox { - border-color: #ddd; + border-color: #ddd; } .noticebox .generalbox { - border: none; - margin:2em 0; + border: none; + margin:2em 0; } .expired, .notopenyet { - border: none; - color: #f00; + border: none; + color: #f00; } .buttons .singlebutton input { - margin: 0 1em; + margin: 0 1em; } .initialbar { - text-align: center; + text-align: center; } .side-pre-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main { - padding-right: 0; + padding-right: 0; } .side-post-only #page-content #region-main-box #region-post-box #region-main-wrap #region-main { - padding-left: 0; + padding-left: 0; } input[type="checkbox"], input[type="radio"] { - margin-right: 7px; + margin-right: 7px; } /* Login ------------------------*/ .loginbox { - margin: 15px 25%; + margin: 15px 25%; } .loginbox .loginerrors { - color: #f00; + color: #f00; } .loginbox .loginform { - margin: 15px auto 0; - width: 175px; + margin: 15px auto 0; + width: 175px; } .loginbox .loginform .form-label { - float: none; - width: 100%; - margin: 0 auto; - text-align: left; + float: none; + width: 100%; + margin: 0 auto; + text-align: left; } .dir-rtl .loginbox .loginform .form-label { - text-align: right; + text-align: right; } .loginbox .loginform .form-input { - float: none; - width: 100%; - margin: 0 auto; + 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; + 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; + margin: 0.5em auto; } .loginbox .forgetpass { - margin: 1em 0 0; - font-size: 0.95em; + margin: 1em 0 0; + font-size: 0.95em; } .loginbox.twocolumns { - width: 90%; - margin-left: 5%; + width: 90%; + margin-left: 5%; } .loginbox .guestsub { - border-top: 1px solid #DDDDDD; - margin: 5px 20% + border-top: 1px solid #DDDDDD; + margin: 5px 20% } .loginbox.twocolumns .loginpanel { - border-color: #ddd; - padding-right: 0.5%; + border-color: #ddd; + padding-right: 0.5%; } .loginbox.twocolumns .signuppanel { - padding-left: 1%; - width: 48%; + padding-left: 1%; + width: 48%; } #page-course-loginas #notice { - border: none; + border: none; } #page-login-forgot_password .generalbox { - margin: 0 auto 1.5em; - width: 75%; - padding: 10px; + margin: 0 auto 1.5em; + width: 75%; + padding: 10px; } #page-login-signup .mform { - width: 85%; - margin: 0 auto; + width: 85%; + margin: 0 auto; } #page-login-signup .mform .fitem .fitemtitle { - width: 20%; + width: 20%; } #page-login-signup .mform .fitem .felement { - margin-left: 21%; + margin-left: 21%; } /* Calendar -----------------------*/ .calendarlayout .sidecalendar { - padding-left: 15px; + padding-left: 15px; } .minicalendarblock h3 { - text-align: center; - font-size: 1.2em; + text-align: center; + font-size: 1.2em; } .maincalendar .header .buttons { - margin: 0; + margin: 0; } .maincalendar .calendarmonth td, .maincalendar .calendarmonth th { - border-color: #ddd; - border-style: dotted; - border-width: 1px; + border-color: #ddd; + border-style: dotted; + border-width: 1px; } .maincalendar .calendarmonth th, .minicalendar th { - background: url([[pix:theme|gradient-sb]]) repeat-x 0 0; + background: url([[pix:theme|gradient-sb]]) repeat-x 0 0; } .maincalendar .calendar-controls { - padding: 10px 5px 0; + padding: 10px 5px 0; } .maincalendar .calendar-controls .previous, .maincalendar .calendar-controls .current, .maincalendar .calendar-controls .next { - float: left; + float: left; } .maincalendar .calendar-controls .current { - margin: 0 auto; - font-size: 1.35em; - text-align: center; - line-height: 1; - font-weight: bold; + margin: 0 auto; + font-size: 1.35em; + text-align: center; + line-height: 1; + font-weight: bold; } .maincalendar .calendar-controls .next { - text-align: right; + text-align: right; } .maincalendar .filters table td { - font-size: 0.9em; + font-size: 0.9em; } .maincalendar .bottom { - margin-top: 25px; + margin-top: 25px; } .minicalendar th abbr { - border: none; + border: none; } .calendar_filters td, .minicalendar td, .minicalendar th { - padding: 2px; - font-size: 0.85em; + padding: 2px; + font-size: 0.85em; } #page-calendar-view .eventlist { - padding-top: 1em; + padding-top: 1em; } #page-calendar-view .eventlist .event { - border: none; + border: none; } #page-calendar-view .eventlist .event .topic { - border-width: 1px 1px 0; - border-color: #ddd; - border-style: solid; - background: #f5f5f5; + border-width: 1px 1px 0; + border-color: #ddd; + border-style: solid; + background: #f5f5f5; } #page-calendar-view .eventlist .event .topic .name { - font-weight: bold; + font-weight: bold; } #page-calendar-view .eventlist .event .description { - border-width: 0 1px 1px; - border-style: solid; - border-color: #ddd; + border-width: 0 1px 1px; + border-style: solid; + border-color: #ddd; } .calendartable .duration ul { - border-width: 2px 0; - border-style: solid; + border-width: 2px 0; + border-style: solid; } .calendartable .duration_user ul { - border-color: #dce7ec; + border-color: #dce7ec; } .calendartable .duration_global ul { - border-color: #d6f8cd; + border-color: #d6f8cd; } .calendartable .duration_group ul { - border-color: #fee7ae; + border-color: #fee7ae; } .calendartable .duration_course ul { - border-color: #ffd3bd; + border-color: #ffd3bd; } .calendartable .duration .events-underway { - color: #666; + color: #666; } .minicalendar { - border-collapse: separate; + border-collapse: separate; } .minicalendar td, .minicalendar th { - font-size: 0.85em; - padding: 0 2px; - border-width: 2px 0; - border-color: #fff; + font-size: 0.85em; + padding: 0 2px; + border-width: 2px 0; + border-color: #fff; } .minicalendar .calendar_event_user, .minicalendar .duration_user { - border-color: #dce7ec; + border-color: #dce7ec; } .minicalendar .calendar_event_course, .minicalendar .duration_course { - border-color: #ffd3bd; + border-color: #ffd3bd; } .minicalendar .calendar_event_global, .minicalendar .duration_global { - border-color: #d6f8cd; + border-color: #d6f8cd; } .minicalendar .calendar_event_group, .minicalendar .duration_group { - border-color: #fee7ae; + border-color: #fee7ae; } /* User @@ -330,87 +335,87 @@ padding: 0 } .userinfobox .content { - text-align: left; - padding-left:10px + text-align: left; + padding-left:10px } .userinfobox .links { - vertical-align: top; - background: #f4f4f4; - padding-left: 10px; + vertical-align: top; + background: #f4f4f4; + padding-left: 10px; } .userinfobox .links a { - display: block; - text-align: left; - + display: block; + text-align: left; + } .profilepicture { - float: left; - margin-right: 10px; + float: left; + margin-right: 10px; } .descriptionbox { - margin-left: 110px; - border: 1px solid #ddd; - padding: 10px; + margin-left: 110px; + border: 1px solid #ddd; + padding: 10px; } .path-user .description { - padding-bottom: 15px; - border-bottom: 1px solid #eee; + padding-bottom: 15px; + border-bottom: 1px solid #eee; } .userprofile .list { - margin-top: 10px; + margin-top: 10px; } .userprofile .list td { - padding-top: 3px; - padding-bottom: 3px; + padding-top: 3px; + padding-bottom: 3px; } .userprofile .list .c0 { - padding-left: 0; - font-weight: bold; + padding-left: 0; + font-weight: bold; } #page-user-view .buttons { - text-align: center; - width: 70%; - margin: 0 auto; + text-align: center; + width: 70%; + margin: 0 auto; } #page-user-view .buttons div { - padding: 0 0 10px; + padding: 0 0 10px; } #page-user-index .controls { - width: 100% + width: 100% } #page-user-index .controls .singleselect { - margin: 0; + margin: 0; } .rolesform { - text-align: center; - margin: 1em 0; + text-align: center; + margin: 1em 0; } #participantsform { - text-align: center; + text-align: center; } #participants { - width: 100%; - margin: 1em auto 0; + width: 100%; + margin: 1em auto 0; } #participants th, #participants td { - vertical-align: middle; + vertical-align: middle; } .groupinfobox {border-color: #DDDDDD;width: 60%;margin-left: 20%;margin-right: 20%;} @@ -419,118 +424,118 @@ padding: 0 ------------------------*/ .path-notes .generalbox { - border: none; + border: none; } /* Roles ------------------------*/ .path-admin-roles .generaltable { - /* width: 65%; hiding because it's causing problems on role/assign */ + /* width: 65%; hiding because it's causing problems on role/assign */ } .path-admin-roles .generaltable th { - vertical-align: middle; + vertical-align: middle; } .path-admin-roles .generaltable .lastcol { - width: 15%; + width: 15%; } .path-admin-roles .backlink { - text-align: center; + text-align: center; } /* Blogs ------------------------*/ .blog_entry .audience { - color: #444; - margin: 0 0 0.5em; - font-size: 0.9em; + color: #444; + margin: 0 0 0.5em; + font-size: 0.9em; } .blog_entry .tags { - margin-bottom: 0.5em; + margin-bottom: 0.5em; } /* Tags ------------------------*/ #big-tag-cloud-box { - padding: 10px; + padding: 10px; } #tag-management-box { - text-align: center; + text-align: center; } .tag-management-form { - border: none; - padding: 0 0 1em; + border: none; + padding: 0 0 1em; } #tag-management-list { - margin: 1em 0 + margin: 1em 0 } #page-tag-index #tag-blogs { - border-width: 0 0 1px; - width: 65%; - margin: 1em auto; + border-width: 0 0 1px; + width: 65%; + margin: 1em auto; } #tagblogentries { - margin: 0 0 1em; + margin: 0 0 1em; } #tagblogentries li { - list-style: none; - padding: 0.25em 0; - margin: 0 + list-style: none; + padding: 0.25em 0; + margin: 0 } #big-tag-cloud-box { - border: none; + border: none; } #tag-user-table { - width: 95%; - margin: 0 auto; - border-width: 0 0 1px; + width: 95%; + margin: 0 auto; + border-width: 0 0 1px; } .managelink { - text-align: right; + text-align: right; } #page-tag-index .headingblock { - text-align: center; - margin-bottom: 0; + text-align: center; + margin-bottom: 0; } #page-tag-index #tag-management-box { - border-bottom: 1px solid #ddd; - padding: 4px 0; + border-bottom: 1px solid #ddd; + padding: 4px 0; } #page-tag-index .relatedpages { - text-align: center; + text-align: center; } #page-tag-manage .lastinitial { - margin-bottom: 0.5em; + margin-bottom: 0.5em; } #page-tag-manage .green { - text-align: center; - padding: 0 0 1em; + text-align: center; + padding: 0 0 1em; } /* YUI overlays ------------------------*/ #helppopupbox { - z-index: 99999 !important; + z-index: 99999 !important; } @@ -538,37 +543,37 @@ padding: 0 ------------------------*/ .pagelayout-embedded { - text-align: center; - background-color: #fff; - background-image: none; + text-align: center; + background-color: #fff; + background-image: none; } .pagelayout-embedded #content { - padding-top: 30px; + padding-top: 30px; } /* Forms -----------------------*/ .mform .fsubmit { - text-align: center; - padding: 2px; + text-align: center; + padding: 2px; } .form-label .form-shortname { - font-size: 0.8em; - color: #777; + font-size: 0.8em; + color: #777; } .form-description { - font-size: 0.95em; - color: #444; + font-size: 0.95em; + color: #444; } .mform .hidden .fitem .fgroup { - width: 100%; - text-align: center; - margin: 1em 0; + width: 100%; + text-align: center; + margin: 1em 0; } .path-backup .mform .hidden .fitem .fgroup { @@ -586,94 +591,143 @@ padding: 0 -----------------------*/ .comment-list li { - background: #eee !important; - list-style: none; + background: #eee !important; + list-style: none; } /* Gradebook ----------------------*/ .path-grade h1.headermain { - text-align: left; /* Strangely necessary TODO: find bug */ + text-align: left; /* Strangely necessary TODO: find bug */ } .gradestable .lastrow th.header { - background: #ddd; + background: #ddd; } .gradestable .lastrow td.cell { - background: #eee !important; + background: #eee !important; } .user-grade td.b1t, .user-grade td.baggt { - background: #ddd !important; + background: #ddd !important; } #page-grade-edit-scale-index .generaltable { - margin: 1em auto; + margin: 1em auto; } #page-grade-report-grader-preferences .generalbox { - border: none; + border: none; } .path-grade-report-grader form { - text-align: left; + text-align: left; } /* Footer -----------------------*/ #page-footer .logininfo { - padding: 1em 0; + padding: 1em 0; } #page-footer .homelink, #page-footer .sitelink { - padding: 1em 0; + padding: 1em 0; } .homelink a { - text-decoration: none; - border-top: 1px solid #cecece; - border-bottom: 2px solid #8a8a8a; - border-left: 1px solid #cecece; - border-right: 2px solid #8a8a8a; + text-decoration: none; + border-top: 1px solid #cecece; + border-bottom: 2px solid #8a8a8a; + border-left: 1px solid #cecece; + border-right: 2px solid #8a8a8a; } .homelink a:hover { - text-decoration: none; - border-bottom: 1px solid #cecece; - border-top: 2px solid #8a8a8a; - border-right: 1px solid #cecece; - border-left: 2px solid #8a8a8a; + text-decoration: none; + border-bottom: 1px solid #cecece; + border-top: 2px solid #8a8a8a; + border-right: 1px solid #cecece; + border-left: 2px solid #8a8a8a; } /** * Enrol - TODO: tidy up styles here */ -.userenrolment {font-size:90%;border:1px solid #999;} -.userenrolment tr.r0 {background-color:#F9F9F9;} -.userenrolment tr.r1 {background-color:#F3F3F3;} -.userenrolment td {border:1px solid #E9E9E9;border-top-color:#F6F6F6;border-right-color:#EEE;border-left-color:#F3F3F3;} -.userenrolment td.c0 {border-left-color:#999;} -.userenrolment td.c4 {border-right-color:#999;} -.userenrolment .col_userdetails {padding:3px;min-width:35%;} -.userenrolment .col_role .roles {position:relative;} -.userenrolment .col_role .role {line-height:10px;font-size:10px;} -.userenrolment .col_role .role a img {height:8px;} -.userenrolment .col_role .addrole {background-color:#DDD;border:1px outset #EEE;-moz-border-radius:5px;} -.userenrolment .col_group {max-width:300px;} -.userenrolment .col_group .group {line-height:10px;font-size:10px;} -.userenrolment .col_group .group a img {height:8px;} -.userenrolment .col_group .addgroup {background-color:#DDD;border:1px outset #EEE;-moz-border-radius:5px;} -.userenrolment .col_enrol {max-width:300px;} -.userenrolment .col_enrol .enrolment {border:1px outset #E6E6E6;background-color:#EEE;line-height:10px;font-size:10px;-moz-border-radius:5px;} +.userenrolment { +font-size:90%; +border:1px solid #999; +} +.userenrolment tr.r0 { +background-color:#F9F9F9; +} +.userenrolment tr.r1 { +background-color:#F3F3F3; +} +.userenrolment td {border:1px solid #E9E9E9; +border-top-color:#F6F6F6; +border-right-color:#EEE; +border-left-color:#F3F3F3; +} +.userenrolment td.c0 { +border-left-color:#999; +} +.userenrolment td.c4 { +border-right-color:#999; +} +.userenrolment .col_userdetails { +padding:3px;min-width:35%; +} +.userenrolment .col_role .roles { +position:relative; +} +.userenrolment .col_role .role { +line-height:10px;font-size:10px; +} +.userenrolment .col_role .role a img { +height:8px; +} +.userenrolment .col_role .addrole { +background-color:#DDD; +border:1px outset #EEE; +-moz-border-radius:5px; +} +.userenrolment .col_group { +max-width:300px; +} +.userenrolment .col_group .group { +line-height:10px;font-size:10px; +} +.userenrolment .col_group .group a img { +height:8px; +} +.userenrolment .col_group .addgroup { +background-color:#DDD; +border:1px outset #EEE; +-moz-border-radius:5px; +} +.userenrolment .col_enrol { +max-width:300px; +} +.userenrolment .col_enrol .enrolment { +border:1px outset #E6E6E6; +background-color:#EEE; +line-height:10px; +font-size:10px; +-moz-border-radius:5px; +} .path-enrol .enrolusersbutton, -.path-enrol .enrolcohortbutton {float:left;} +.path-enrol .enrolcohortbutton { +float:left; +} .path-enrol .enrolusersbutton.instance1, -.path-enrol .enrolcohortbutton.instance1 {float:right;} +.path-enrol .enrolcohortbutton.instance1 { +float:right; +} /* Registration */ #page-admin-registration-hubselector .registration_textfield {width: 400px;} @@ -681,4 +735,8 @@ padding: 0 /** * Redirect */ -.pagelayout-redirect #content {text-align:center;margin-top:10%;margin-bottom:10%;} \ No newline at end of file +.pagelayout-redirect #content { +text-align:center; +margin-top:10%; +margin-bottom:10%; +} \ No newline at end of file diff --git a/theme/canvas/style/text.css b/theme/canvas/style/text.css index e84c85f9eed..f0d97a44fa3 100644 --- a/theme/canvas/style/text.css +++ b/theme/canvas/style/text.css @@ -1,163 +1,158 @@ /* Text Elements --------------------------*/ -body { - font-size: 85%; - line-height: 1.4; -} - -body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { - font-family: Helvetica, Arial, sans-serif; +h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { + font-family: Helvetica, Arial, sans-serif; } h1,h2,h3,h4,h5,h6 { - font-weight: bold; - margin: 0; + font-weight: bold; + margin: 0; } h2.main,h3.main,h4.main { - text-align: center; - padding: 0.5em 0 1em; - margin: 0; + text-align: center; + padding: 0.5em 0 1em; + margin: 0; } h1 { - font-size: 2.25em; - line-height: 1; - margin-bottom: 0.5em; + font-size: 2.25em; + line-height: 1; + margin-bottom: 0.5em; } h2 { - font-size: 1.5em; - margin-bottom: 0.5em; + font-size: 1.5em; + margin-bottom: 0.5em; } h3 { - font-size: 1.25em; - line-height: 1; - margin-bottom: 0.5em; + font-size: 1.25em; + line-height: 1; + margin-bottom: 0.5em; } h4 { - font-size: 1.1em; - line-height: 1.25; - margin-bottom: 0.75em; + font-size: 1.1em; + line-height: 1.25; + margin-bottom: 0.75em; } h5 { - font-size: 1em; - margin-bottom: 1em; + font-size: 1em; + margin-bottom: 1em; } h6 { - font-size: 1em; + font-size: 1em; } p { - margin: 0 0 1em; + margin: 0 0 1em; } ul, ol { - margin: 0 1.5em 1.5em 1.5em; + margin: 0 1.5em 1.5em 1.5em; } ul { - list-style-type: circle; + list-style-type: circle; } ol { - list-style-type: decimal; + list-style-type: decimal; } dl { - margin: 0 0 1.5em 0; + margin: 0 0 1.5em 0; } dl dt { - font-weight: bold; + font-weight: bold; } dl dd { - margin-left: 1.5em; + margin-left: 1.5em; } abbr, acronym { - border-bottom: 1px dotted #000; + border-bottom: 1px dotted #000; } address { - margin-top: 1.5em; - font-style: italic; + margin-top: 1.5em; + font-style: italic; } del { - color: #000; + color: #000; } a { - text-decoration: none; + text-decoration: none; } blockquote { - margin: 1.5em; + margin: 1.5em; } strong { - font-weight: bold; + font-weight: bold; } em, dfn { - font-style: italic; + font-style: italic; } dfn { - font-weight: bold; + font-weight: bold; } pre, code { - white-space: pre; + white-space: pre; } pre, code, tt { - font: 1.2em monospace; - line-height: 1.5; - margin: 1.5em 0; + font: 1.2em monospace; + line-height: 1.5; + margin: 1.5em 0; } .small { - font-size: .8em; - margin-bottom: 1.875em; - line-height: 1.875em; + font-size: .8em; + margin-bottom: 1.875em; + line-height: 1.875em; } .large { - font-size: 1.25em; - line-height: 1.5em; - margin-bottom: 1em; + font-size: 1.25em; + line-height: 1.5em; + margin-bottom: 1em; } .quiet { - color: #999; + color: #999; } .hide { - display: none; + display: none; } .icon.hide { - display: inline; + display: inline; } .highlight { - background: #ffc; + background: #ffc; } .top { - margin-top: 0; - padding-top: 0; + margin-top: 0; + padding-top: 0; } .bottom { - margin-bottom: 0; - padding-bottom: 0; + margin-bottom: 0; + padding-bottom: 0; } \ No newline at end of file