From d195d5904fc18e857082b1a52e546a925768af50 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Tue, 25 Sep 2012 19:39:45 +1200 Subject: [PATCH] FIX: resolve 404 errors with concatenated stylesheets --- themes/docs/templates/DocumentationViewer.ss | 2 +- themes/ssorgsites/css/core.css | 49 +++++------- themes/ssorgsites/css/form.css | 9 --- themes/ssorgsites/css/print.css | 9 --- themes/ssorgsites/css/typography.css | 82 +++++++++++++------- 5 files changed, 73 insertions(+), 78 deletions(-) diff --git a/themes/docs/templates/DocumentationViewer.ss b/themes/docs/templates/DocumentationViewer.ss index a5d5d7f..c6c5b4f 100644 --- a/themes/docs/templates/DocumentationViewer.ss +++ b/themes/docs/templates/DocumentationViewer.ss @@ -60,7 +60,7 @@ <% end_if %> -
+
$Layout
diff --git a/themes/ssorgsites/css/core.css b/themes/ssorgsites/css/core.css index 34e5a90..f99a9f6 100755 --- a/themes/ssorgsites/css/core.css +++ b/themes/ssorgsites/css/core.css @@ -1,19 +1,3 @@ -/** ---------------------------------------------------------- - * - * Contains the core styles for all the silverstripe sites. - * - * If you plan on including this file in a ss project you are doing it wrong. - * you should link to the ss.screen.min.css and ss.print.min.css file in - * your project which this combines down to. - * It also ensures that you have all the core styles. - * - * - * Notes: our vertical grid is set to 7px. - * ------------------------------------------------------- */ - -/* ------------------------------------------------------- - * Reset Styles - * ------------------------------------------------------- */ body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td { margin:0; padding:0; } @@ -125,12 +109,12 @@ a { color: #0973A6; text-decoration: none; } } #header h1 a.logo { - background: #fff url(../../ssorgsites/images/logo.png) no-repeat bottom left; + background: #fff url(../../../themes/ssorgsites/images/logo.png) no-repeat bottom left; height: 55px; width:162px; display: inline-block; } #header h1 a.logo:hover { - background: #fff url(../../ssorgsites/images/logo.png) no-repeat 0 -50px; + background: #fff url(../../../themes/ssorgsites/images/logo.png) no-repeat 0 -50px; } /* Breadcrumbs */ @@ -164,7 +148,7 @@ a { color: #0973A6; text-decoration: none; } #search input.text { float: right; width: 170px; height: 22px; - background: url(../../ssorgsites/images/search.png) top left no-repeat; + background: url(../../../themes/ssorgsites/images/search.png) top left no-repeat; font-size: 11px; color: #495C56; outline: none; @@ -182,7 +166,7 @@ a { color: #0973A6; text-decoration: none; } border: none; text-indent: 99999px; cursor: pointer; - background: url(../../ssorgsites/images/search.png) top right no-repeat; + background: url(../../../themes/ssorgsites/images/search.png) top right no-repeat; } /* Search Results */ @@ -349,7 +333,7 @@ ul.pagination { .notice a.close, .warning a.close, .info a.close { - background:url("../images/ico_close_off.png") no-repeat scroll left top transparent; + background:url(../../../themes/ssorgsites/images/ico_close_off.png) no-repeat scroll left top transparent; display:block; font-size:0; height:11px; @@ -366,7 +350,7 @@ ul.pagination { padding: 13px 10px 0px 60px; clear: both; margin: 9px 0 18px; - background: #f9fafa url(../images/lightbulb.png) no-repeat 21px 14px; + background: #f9fafa url(../../../themes/ssorgsites/images/lightbulb.png) no-repeat 21px 14px; } .typography .note h3, .typography .hint h3 { @@ -384,7 +368,7 @@ ul.pagination { padding: 13px 10px 0px 60px; margin: 9px 0 18px; position: relative; - background: #FFFAC6 url(../images/notification.png) no-repeat 18px 11px; + background: #FFFAC6 url(../../../themes/ssorgsites/images/notification.png) no-repeat 18px 11px; } p.notice { padding-bottom: 18px; @@ -395,7 +379,7 @@ ul.pagination { clear: both; margin: 7px 0 21px; position: relative; - background: #fdf1f3 url(../images/error_button.png) no-repeat 18px 11px; + background: #fdf1f3 url(../../../themes/ssorgsites/images/error_button.png) no-repeat 18px 11px; } .info { border: 1px solid #6baad8; @@ -403,7 +387,7 @@ ul.pagination { clear: both; margin: 9px 0 18px; position: relative; - background: #f7fcff url(../images/info_button.png) no-repeat 18px 11px; + background: #f7fcff url(../../../themes/ssorgsites/images/info_button.png) no-repeat 18px 11px; } .warning p { @@ -420,16 +404,21 @@ ul.pagination { background-color: #F9FAFA; border: 1px solid #d3d9dc; padding: 13px 9px 13px 66px; - background: #F9FAFA url(../../ssorgsites/images/warning.png) no-repeat 18px 14px; + background: #F9FAFA url(../../../themes/ssorgsites/images/warning.png) no-repeat 18px 14px; } -#content .warningBoxTop h1 { font-size: 27px; margin-bottom: 0; letter-spacing: 0; } -#content .warningBoxTop ul { margin: 9px 0 18px; } -#content .warningBoxTop li { margin-bottom: 4px; } +#content .warningBoxTop h1 { + font-size: 27px; margin-bottom: 0; letter-spacing: 0; +} +#content .warningBoxTop ul { + margin: 9px 0 18px; +} +#content .warningBoxTop li { + margin-bottom: 4px; +} #content .warningBoxBottom { background-color: #0973A6; padding: 12px 0 16px; - /* background: url(../../ssorgsites/images/warning.png) no-repeat scroll 22px 13px #0973A6; */ } #content .warningBoxBottom a { color: #fff; } #content .warningBoxBottom a:hover { color: #f3fbfe; } diff --git a/themes/ssorgsites/css/form.css b/themes/ssorgsites/css/form.css index f5f6927..be8e974 100755 --- a/themes/ssorgsites/css/form.css +++ b/themes/ssorgsites/css/form.css @@ -1,12 +1,3 @@ -/** ---------------------------------------------------------- - * - * Contains the generic theme form styles - * - * Vertical alignment 9px. - * - * @author Michael Andrewartha - * @author Will Rossiter - * ------------------------------------------------------- */ form fieldset { border: 0; } \ No newline at end of file diff --git a/themes/ssorgsites/css/print.css b/themes/ssorgsites/css/print.css index 9b1ea0e..f261cbf 100644 --- a/themes/ssorgsites/css/print.css +++ b/themes/ssorgsites/css/print.css @@ -1,12 +1,3 @@ -/** ---------------------------------------------------------- - * - * Print stylesheet for the ssorg sites. Handles common printing - * functionality and helper classes - * - * @author Michael Andrewartha - * @author Will Rossiter - * ------------------------------------------------------- */ - * { float: none; } html { background: #fff; } diff --git a/themes/ssorgsites/css/typography.css b/themes/ssorgsites/css/typography.css index 17cb540..7ecf5ba 100755 --- a/themes/ssorgsites/css/typography.css +++ b/themes/ssorgsites/css/typography.css @@ -1,42 +1,52 @@ -/** ---------------------------------------------------------- - * - * Contains the generic theme typography styles - * - * Vertical alignment 7px. - - * @author Will Rossiter - * ------------------------------------------------------- */ +/*! vertical grid = 7px */ .typography p { - font-size: 12px; line-height: 18px; margin-bottom: 18px; color: #222; + font-size: 14px; + line-height: 21px; + margin-bottom: 14px; + color: #222; } .typography h1 { - font-size: 32px; line-height: 36px; letter-spacing: -1px; - margin-bottom: 24px; + font-size: 32px; + line-height: 35px; + letter-spacing: -1px; + margin-bottom: 21px; color: #222; } + .typography h1 + p { + font-size: 18px; + line-height: 27px; + } + .typography h2 { - font-size: 24px; line-height: 36px; - margin-bottom: 18px; + font-size: 24px; + line-height: 28px; + margin: 28px 0 7px; color: #222; } + .typography h3 { - font-size: 18px; line-height: 18px; - margin-bottom: 18px; color: #222; + font-size: 18px; + line-height: 21px; + margin-bottom: 14px; + color: #222; } .typography h4 { - font-size: 16px; line-height: 18px; - margin-bottom: 18px; + font-size: 16px; + line-height: 21px; + margin-bottom: 14px; } .typography h5 { - font-size: 14px; line-height: 18px; - margin-bottom: 18px; + font-size: 14px; + line-height: 21px; + margin-bottom: 14px; } .typography h6 { - font-size: 12px; line-height: 18px; - margin-bottom: 8px; + font-size: 12px; + line-height: 14px; + margin-bottom: 7px; } h1 .heading-anchor-link, @@ -90,9 +100,12 @@ h6 .heading-anchor-link { /* Code */ .typography code { - font: 12px/18px Monaco, 'Bitstream Vera Sans Mono', Courier, monospace; background: none repeat scroll 0 0 #FEFFF0; + font: 13px/21px Monaco, 'Bitstream Vera Sans Mono', Courier, monospace; + background: none repeat scroll 0 0 #FEFFF0; } - .typography code a { color: #444; } + .typography code a { + color: #444; + } .typography pre { margin-bottom: 28px; @@ -119,27 +132,38 @@ h6 .heading-anchor-link { .typography table { border-collapse: collapse; width: 100%; - background-color: #F8f9fa; margin-bottom: 17px; + background-color: #fafafa; + margin-bottom: 28px; border: 1px solid #c3cdca; } .typography table tr:nth-child(even) { - background: #e9efef; + background: #eef4f6; } .typography table caption { - text-align: left; font-weight: bold; font-size: 18px; line-height: 21px; + text-align: left; + font-weight: bold; + font-size: 18px; + line-height: 21px; + } + .typography table thead { + background: #fafafa; } - .typography table thead { } .typography table thead th { - padding: 9px 5px; + padding: 7px 10px 6px; font-size: 12px; text-align: left; + border-right: 1px solid #c3cdca; } .typography table tbody tr { border-top: 1px solid #c3cdca; } + .typography table td { - font-size: 12px; line-height: 18px; padding: 9px; + font-size: 12px; + line-height: 21px; + padding: 7px; + border-right: 1px solid #c3cdca; } /* Icons */