From 34d2c67228846ab89bf1fc3d10d6acb5f6779c13 Mon Sep 17 00:00:00 2001 From: Patrick Malley Date: Thu, 15 Jul 2010 06:42:08 +0000 Subject: [PATCH] MDL-22875 - general improvements in modules --- theme/canvas/style/blocks.css | 99 +++++++++++++++++++++++---- theme/canvas/style/core.css | 122 +++++++++++++++++++++++++++++++--- theme/canvas/style/mods.css | 68 ++++++++++++++++++- 3 files changed, 265 insertions(+), 24 deletions(-) diff --git a/theme/canvas/style/blocks.css b/theme/canvas/style/blocks.css index cff92efde8a..4091ced4820 100644 --- a/theme/canvas/style/blocks.css +++ b/theme/canvas/style/blocks.css @@ -1,22 +1,93 @@ -.block { padding: 0 } +.block { + padding: 0 +} -.block .footer { margin-top: 10px; margin-bottom: 0; text-align: center; } +.block .footer { + margin-top: 10px; + margin-bottom: 0; + text-align: center; +} -.block_action .reloadnavigation { margin-right: 3px; } +.block_action .reloadnavigation { + margin-right: 3px; +} -.block_news_items .newlink { text-align: center; margin-bottom: 5px; } +.block .header .commands .icon { + padding-left: 2px; + padding-right: 2px; + margin-right: 2px; +} -.block_news_items .post .head { font-style: italic; font-size: 0.9em; margin-top: 10px; } -.block_news_items .post .date { float: right; text-align: right; } -.block_news_items .post .name { float: left; color: #555; } +.block h3.main { + padding: 0.5em 0; + text-align: left; + font-size: 1.1em; +} -.block_calendar_upcoming .event { font-weight: bold; } -.block_calendar_upcoming .date { font-weight: normal; font-size: 0.85em; font-style: italic; margin-left: 20px; } -.block_recent_activity .activitydate { font-size: 0.9em; color: #444; margin-bottom: 5px; } -.block_recent_activity .activityhead { font-size: 0.95em; margin: 0.5em 0; } +/* News +-------------------------------*/ + +.block_news_items .newlink { + text-align: center; + margin-bottom: 5px; +} + +.block_news_items .post .head { + font-style: italic; + font-size: 0.9em; + margin-top: 10px; +} + +.block_news_items .post .date { + float: right; + text-align: right; +} + +.block_news_items .post .name { + float: left; + color: #555; +} + +/* Calendar +--------------------------------*/ + +.block_calendar_upcoming .event { + font-weight: bold; +} + +.block_calendar_upcoming .date { + font-weight: normal; + font-size: 0.85em; + font-style: italic; + margin-left: 20px; +} + +.block_recent_activity .activitydate { + font-size: 0.9em; + color: #444; + margin-bottom: 5px; +} + +.block_recent_activity .activityhead { + font-size: 0.95em; + margin: 0.5em 0; +} + +/* Messages and Online Users +-------------------------------*/ .block_messages .info, -.block_online_users .info { text-align: center; font-size: 0.85em; color: #444; margin-bottom: 7px; } -.block_blog_menu .list li { font-size: 0.9em; margin: 0.25em 0; } +.block_online_users .info { + text-align: center; + font-size: 0.85em; + color: #444; + margin-bottom: 7px; +} -.block .header .commands .icon { padding-left:2px;padding-right:2px;margin-right:2px;} +/* Blog Menu +------------------------------*/ + +.block_blog_menu .list li { + font-size: 0.9em; + margin: 0.25em 0; +} diff --git a/theme/canvas/style/core.css b/theme/canvas/style/core.css index e0d7707a588..a64b51f9702 100644 --- a/theme/canvas/style/core.css +++ b/theme/canvas/style/core.css @@ -18,6 +18,15 @@ body { color: #333; } +#notice { + text-align: center; +} + +#notice p { + color: #f00; +} + +.noticebox, .expired, .notopenyet, .notifysuccess, @@ -39,6 +48,11 @@ body { border-color: #ddd; } +.noticebox .generalbox { + border: none; + margin:2em 0; +} + .expired, .notopenyet { border: none; @@ -46,7 +60,7 @@ body { } .buttons .singlebutton input { - margin: 0; + margin: 0 1em; } .initialbar { @@ -61,6 +75,11 @@ body { padding-left: 0; } +input[type="checkbox"], +input[type="radio"] { + margin-right: 7px; +} + /* Login ------------------------*/ @@ -132,7 +151,7 @@ body { width: 48%; } -.page-course-loginas #notice { +#page-course-loginas #notice { border: none; } @@ -310,7 +329,25 @@ body { -----------------------*/ .userinfobox { - border: none; +border-color: #ddd; +padding: 0 +} + +.userinfobox .content { + text-align: left; + padding-left:10px +} + +.userinfobox .links { + vertical-align: top; + background: #f4f4f4; + padding-left: 10px; +} + +.userinfobox .links a { + display: block; + text-align: left; + } .profilepicture { @@ -373,6 +410,7 @@ body { #longtimenosee { font-style: italic; font-size: 0.95em; + text-align: center; } #participants { @@ -385,6 +423,13 @@ body { vertical-align: middle; } +/* Notes +------------------------*/ + +.path-notes .generalbox { + border: none; +} + /* Roles ------------------------*/ @@ -438,20 +483,32 @@ body { } #page-tag-index #tag-blogs { - border: none; + border-width: 0 0 1px; + width: 65%; + margin: 1em auto; } #tagblogentries { - width: 75%; - margin: 0 auto 1em; + margin: 0 0 1em; +} + +#tagblogentries li { + list-style: none; + padding: 0.25em 0; + margin: 0 +} + +#big-tag-cloud-box { + border: none; } #tag-user-table { width: 95%; margin: 0 auto; + border-width: 0 0 1px; } -#page-tag-index .managelink { +.managelink { text-align: right; } @@ -465,7 +522,6 @@ body { padding: 4px 0; } -#page-tag-index .moreblogs, #page-tag-index .relatedpages { text-align: center; } @@ -479,6 +535,8 @@ body { padding: 0 0 1em; } + + /* Embedded Pages ------------------------*/ @@ -501,7 +559,7 @@ body { } .form-label .form-shortname { - font-size: 0.9em; + font-size: 0.8em; color: #777; } @@ -510,6 +568,52 @@ body { color: #444; } +.mform .hidden .fitem .fgroup { + width: 100%; + text-align: center; + margin: 1em 0; +} + +/* Comments +-----------------------*/ + +.comment-list li { + background: #eee !important; + list-style: none; +} + +/* Gradebook +----------------------*/ + +.path-grade h1.headermain { + text-align: left; /* Strangely necessary TODO: find bug */ +} + +.gradestable .lastrow th.header { + background: #ddd; +} + +.gradestable .lastrow td.cell { + background: #eee !important; +} + +.user-grade td.b1t, +.user-grade td.baggt { + background: #ddd !important; +} + +#page-grade-edit-scale-index .generaltable { + margin: 1em auto; +} + +#page-grade-report-grader-preferences .generalbox { + border: none; +} + +.path-grade-report-grader form { + text-align: left; +} + /* Footer -----------------------*/ diff --git a/theme/canvas/style/mods.css b/theme/canvas/style/mods.css index 5f83c9d14d6..772de35982a 100644 --- a/theme/canvas/style/mods.css +++ b/theme/canvas/style/mods.css @@ -4,6 +4,19 @@ padding: 10px; } +/* +** Needs to be taken out of mod sheets and added +** to Base so we can change the following to +** just .mod_introbox. +*/ + +#urlintro, +#pageintro, +#resourceintro { + border-color:#ddd; + margin: 0 10% 3% +} + /* Forums -------------------------*/ @@ -67,11 +80,19 @@ /* Assignment ------------------------*/ +.path-mod-assignment .reportlink { + font-size: 0.9em; +} + .path-mod-assignment #dates { margin: 1em auto; border: none; } +.path-mod-assignment #dates .c0 { + background: #f6f6f6; +} + .path-mod-assignment #dates table { margin: 0 auto; } @@ -80,12 +101,31 @@ border: 1px solid #ddd; } +.path-mod-assignment .generalbox { + border: none; +} + +.path-mod-assignment #intro { + border: 1px solid #ddd; +} + +.path-mod-assignment .generalbox .files { + width:35%; + margin: 2em auto; + border-bottom: 1px solid #eee; + padding: 10px; +} + .path-mod-assignment #userfiles { width: 50%; margin: 0 auto; padding: 10px; } +.path-mod-assignment #userfiles .files { + width:100%; +} + .path-mod-assignment .nofiles { text-align: center; color: #f00; @@ -127,6 +167,12 @@ width: 90%; } +#online, +#onlineenter { + border: none; + margin-top: 1em; +} + #page-mod-assignment-view #onlineenter .mform { margin: 0; } @@ -383,4 +429,24 @@ .branchbuttoncontainer input { margin: 10px; -} \ No newline at end of file +} + +/* Resources +-------------------------------*/ + +.path-mod-page .generalbox { + border: none; +} + +.resourceworkaround, +.urlworkaround, +.modified { + text-align: center; + font-size: 0.85em; + color: #777; + margin-top: 1em; +} + +#page-mod-folder-edit .foldertree { + width: 65%; +}