From b3d5a51a8d0b65722c22acc211c15132a1b3d8ec Mon Sep 17 00:00:00 2001 From: Mary Evans Date: Sun, 20 May 2012 01:15:25 +0100 Subject: [PATCH] MDL-33110 themes: removed redundent boilerplate.css from Boxxie and all layout files from Serenity. --- theme/boxxie/style/boilerplate.css | 147 ---------------------------- theme/serenity/layout/embedded.php | 23 ----- theme/serenity/layout/frontpage.php | 117 ---------------------- theme/serenity/layout/general.php | 121 ----------------------- 4 files changed, 408 deletions(-) delete mode 100644 theme/boxxie/style/boilerplate.css delete mode 100644 theme/serenity/layout/embedded.php delete mode 100644 theme/serenity/layout/frontpage.php delete mode 100644 theme/serenity/layout/general.php diff --git a/theme/boxxie/style/boilerplate.css b/theme/boxxie/style/boilerplate.css deleted file mode 100644 index 3bf99fc640b..00000000000 --- a/theme/boxxie/style/boilerplate.css +++ /dev/null @@ -1,147 +0,0 @@ -/* -------------------------------------------------------------- - - Boilerplate reset.css - * Resets default browser CSS. - --------------------------------------------------------------- */ - -html, body, div, span, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, code, del, dfn, em, img, q, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td { margin: 0; padding: 0; border: 0; font-weight: inherit; font-style: inherit; font-size: 100%; font-family: inherit; vertical-align: baseline; } -body { line-height: 1.5; background: #fff; margin: 0; } -table { border-collapse: collapse; border-spacing: 0; } -caption, th, td { text-align: left; font-weight:400; } -blockquote:before, blockquote:after, q:before, q:after { content: ""; } -blockquote, q { quotes: "" ""; } -a img { border: none; } -input,textarea { margin: 0; } - -/* Removes Firefox imposed outline */ -a { outline: none; } - -/* Clearing floats without extra markup */ -.wrapper { display: inline-block; } -.wrapper:after { content: "."; display: block; height: 0; clear: both; visibility: hidden; } -* html .wrapper { height: 1%; } -.wrapper { display: block; } - -/* -------------------------------------------------------------- - - Boilerplate typography.css - * Sets up some sensible default typography. - --------------------------------------------------------------- */ - -/* This is where you set your desired font size. The line-heights - and vertical margins are automatically calculated from this. - The percentage is of 16px (0.75 * 16px = 12px). */ -body { font-size: 85%; } - - -/* Default fonts and colors. */ -body,h1,h2,h3,h4,h5,h6,p,ul,ol,dl,input,textarea { font-family: Helvetica, Arial, sans-serif; } - - -/* Headings --------------------------------------------------------------- */ - -h1,h2,h3,h4,h5,h6 { font-weight: bold; } - -h1 { font-size: 2.25em; line-height: 1; margin-bottom: 0.5em; } -h2 { font-size: 1.75em; margin-bottom: 0.5em; } -h3 { font-size: 1.5em; line-height: 1; margin-bottom: 1em; } -h4 { font-size: 1.2em; line-height: 1.25; margin-bottom: 1em; } -h5 { font-size: 1em; margin-bottom: 1.5em; } -h6 { font-size: 1em; } - - -/* Text elements --------------------------------------------------------------- */ - -p { margin: 0 0 1em; } - -ul, ol { margin: 0 1.5em 1.5em 1.5em; } -ul { list-style-type: circle; } -ol { list-style-type: decimal; } - -dl { margin: 0 0 1.5em 0; } -dl dt { font-weight: bold; } -dl dd { margin-left: 1.5em; } - -abbr, acronym { border-bottom: 1px dotted #000; } -address { margin-top: 1.5em; font-style: italic; } -del { color: #000; } - -a { color: #009; text-decoration: none; } -a:hover { text-decoration: underline; } - -blockquote { margin: 1.5em; } -strong { font-weight: bold; } -em, dfn { font-style: italic; } -dfn { font-weight: bold; } -pre, code { margin: 1.5em 0; white-space: pre; } -pre, code, tt { font: 1.2em monospace; line-height: 1.5; } -tt { display: block; margin: 1.5em 0; line-height: 1.5; } - - -/* Tables --------------------------------------------------------------- */ - -th { border-bottom: 2px solid #ddd; font-weight: bold; } -th,td { padding: 4px;vertical-align: middle } -tfoot { font-style: italic; } -caption { background: #ffc; } - - -/* Some default classes --------------------------------------------------------------- */ - -.small { font-size: .8em; margin-bottom: 1.875em; line-height: 1.875em; } -.large { font-size: 1.25em; line-height:1.5em; margin-bottom: 1em; } -.quiet { color: #999; } - -.hide { display: none; } -.highlight { background: #ffc; } - -.top { margin-top: 0; padding-top: 0; } -.bottom { margin-bottom: 0; padding-bottom: 0; } - -/* -------------------------------------------------------------- - - Boilerplate forms.css - * Sets up some default styling for forms - --------------------------------------------------------------- */ - -label { font-weight: bold; } - -/* Fieldsets */ -fieldset { padding: 1.4em; margin: 0 0 1.5em 0; border: 1px solid #ddd; } -legend { padding: 0 .4em; font-weight: bold; font-size: 1.2em; } - -/* Textareas */ -textarea { margin: 0.5em 0.5em 0 0; } -textarea { padding: .4em; } - - -/* hForm --------------------------------------------------------------- */ -form.hform p { margin: 0 0 .5em; } -form.hform p label { float: left; width: 100px; } - -form.hform p input { width: 200px; } -form.hform p select { width: 200px; } - -form.hform p input.button { width: auto; } -form.hform p input.checkbox { width: auto; } -form.hform p input.radio { width: auto; } - -form.hform p.checkbox { margin-left: 100px; } -form.hform p.checkbox label { float: none; } -form.hform p.checkbox input { width: auto; } - - -/* vForm --------------------------------------------------------------- */ -form.vform p { margin: 0 0 .5em; } -form.vform p label { display: block; } - -form.vform p.checkbox label { display: inline; } diff --git a/theme/serenity/layout/embedded.php b/theme/serenity/layout/embedded.php deleted file mode 100644 index 9d39e027491..00000000000 --- a/theme/serenity/layout/embedded.php +++ /dev/null @@ -1,23 +0,0 @@ -doctype() ?> -htmlattributes() ?>> - - <?php echo $PAGE->title ?> - - standard_head_html() ?> - - -standard_top_of_body_html() ?> - -
- - - -
- main_content() ?> -
- - -
-standard_end_of_body_html() ?> - - \ No newline at end of file diff --git a/theme/serenity/layout/frontpage.php b/theme/serenity/layout/frontpage.php deleted file mode 100644 index 3c21eaaa6b7..00000000000 --- a/theme/serenity/layout/frontpage.php +++ /dev/null @@ -1,117 +0,0 @@ -layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); -$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); - -$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); -$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); -$custommenu = $OUTPUT->custom_menu(); -$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); - -$bodyclasses = array(); -if ($showsidepre && !$showsidepost) { - $bodyclasses[] = 'side-pre-only'; -} else if ($showsidepost && !$showsidepre) { - $bodyclasses[] = 'side-post-only'; -} else if (!$showsidepost && !$showsidepre) { - $bodyclasses[] = 'content-only'; -} -if ($hassidepre || $hassidepost) { - $bodyclasses[] = 'background'; -} -if ($hascustommenu) { - $bodyclasses[] = 'has_custom_menu'; -} - -echo $OUTPUT->doctype() ?> -htmlattributes() ?>> - - <?php echo $PAGE->title ?> - - - standard_head_html() ?> - - -standard_top_of_body_html() ?> - -
-
- - - -
-
-

heading ?>

-
- login_info(); - echo $OUTPUT->lang_menu(); - echo $PAGE->headingmenu; - ?> -
-
-
- -
- - - - - -
-
-
-
- -
-
-
- main_content() ?> -
-
-
- - -
-
- blocks_for_region('side-pre') ?> -
-
- - - -
-
- blocks_for_region('side-post') ?> -
-
- - -
-
-
-
- - - -
- - - -
-

- -

- - login_info(); - echo $OUTPUT->home_link(); - echo $OUTPUT->standard_footer_html(); - ?> -
- - -
-standard_end_of_body_html() ?> - - diff --git a/theme/serenity/layout/general.php b/theme/serenity/layout/general.php deleted file mode 100644 index 3c454f3e470..00000000000 --- a/theme/serenity/layout/general.php +++ /dev/null @@ -1,121 +0,0 @@ -heading); -$hasnavbar = (empty($PAGE->layout_options['nonavbar']) && $PAGE->has_navbar()); -$hasfooter = (empty($PAGE->layout_options['nofooter'])); -$hassidepre = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-pre', $OUTPUT)); -$hassidepost = (empty($PAGE->layout_options['noblocks']) && $PAGE->blocks->region_has_content('side-post', $OUTPUT)); - -$showsidepre = ($hassidepre && !$PAGE->blocks->region_completely_docked('side-pre', $OUTPUT)); -$showsidepost = ($hassidepost && !$PAGE->blocks->region_completely_docked('side-post', $OUTPUT)); -$custommenu = $OUTPUT->custom_menu(); -$hascustommenu = (empty($PAGE->layout_options['nocustommenu']) && !empty($custommenu)); - -$bodyclasses = array(); -if ($showsidepre && !$showsidepost) { - $bodyclasses[] = 'side-pre-only'; -} else if ($showsidepost && !$showsidepre) { - $bodyclasses[] = 'side-post-only'; -} else if (!$showsidepost && !$showsidepre) { - $bodyclasses[] = 'content-only'; -} -if ($hascustommenu) { - $bodyclasses[] = 'has_custom_menu'; -} -echo $OUTPUT->doctype() ?> -htmlattributes() ?>> - - <?php echo $PAGE->title ?> - - standard_head_html() ?> - - -standard_top_of_body_html() ?> - -
-
- - -
- - -

heading ?>

-
- login_info(); - if (!empty($PAGE->layout_options['langmenu'])) { - echo $OUTPUT->lang_menu(); - } - echo $PAGE->headingmenu - ?> -
- - -
- - -
- - - -
-
navbar(); ?>
-
button; ?>
-
- - - - - - -
-
-
-
- -
-
-
- main_content() ?> -
-
-
- - -
-
- blocks_for_region('side-pre') ?> -
-
- - - -
-
- blocks_for_region('side-post') ?> -
-
- - -
-
-
-
- -
- - - -
-

- login_info(); - echo $OUTPUT->home_link(); - echo $OUTPUT->standard_footer_html(); - ?> -
- -
-standard_end_of_body_html() ?> - -