diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/bromley/base.scss | 22 | ||||
-rw-r--r-- | web/cobrands/bromley/bromley.scss | 26 | ||||
-rw-r--r-- | web/cobrands/bromley/layout.scss | 22 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_layout.scss | 1 |
4 files changed, 67 insertions, 4 deletions
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 4594f832f..710078118 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -5,3 +5,25 @@ @import "../fixmystreet/_base"; +// Want a white header, and logo is slightly bigger +#site-header { + @include background(linear-gradient(#ddd, #fff 10%, #fff)); + height: 4em; +} + +// Colour tab to match colour scheme +#nav-link { + width: 50px; + height: 48px; + background: url('/cobrands/bromley/tab-blue.png') 0 0 no-repeat; +} + +// Change logo to logo of council +#site-logo { + display: block; + width: 80px; + height: 44px; + top: 0.9em; + background: url('/cobrands/bromley/bromley-logo.s.jpg') 0 0 no-repeat; +} + diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss index 6e56bb482..5673df8ad 100644 --- a/web/cobrands/bromley/bromley.scss +++ b/web/cobrands/bromley/bromley.scss @@ -1,7 +1,15 @@ +/* Parts of Bromley's main CSS needed for its header/footer and adjusted (see + * bottom) to not be affected by main FixMyStreet CSS. Not very sustainable; + * perhaps we should wrap all council CSS within a SCSS #council ID? Hmm. + */ + +@import "compass"; + h1, h2, h3, h4, h5, h6, legend { font-family: 'Gill Sans', 'Trebuchet MS', Calibri, sans-serif; } body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; line-height: 1.4; } -#header { padding: 0 18px 0 25px; } +// #header renamed to #bromley-header +#bromley-header { padding: 0 18px 0 25px; } .header-nav {float:right; background:url('http://www.bromley.gov.uk/site/styles/css_img/header-nav.gif') no-repeat; overflow:hidden; width:651px; height:34px; line-height:34px; padding:0 20px;} .header-nav li {float:left; width:130px; text-align:center; background:url('http://www.bromley.gov.uk/site/styles/css_img/header-nav-divider.gif') top right no-repeat;} @@ -32,8 +40,8 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; #search input { background: #ececec; border: 1px solid #768b9a; border-color: #768b9a #d1dee8 #d1dee8 #768b9a; line-height: 9px; padding: 6px 5px 4px; width: 184px; } #search input.button { background: #fff; border: 1px solid #8596a8; color: #333; font-family: 'Gill Sans', 'Trebuchet MS', Calibri, sans-serif; font-size:133%; height: 27px; line-height: 27px; padding: 0; vertical-align: top; width: 70px; } -/* ############################################################## */ -#bromley-footer { background: #666 url('http://www.bromley.gov.uk/site/styles/css_img/footer.gif') top center no-repeat; clear: both; padding:30px 15px 50px; margin-left:-15px; color:#fff; font-size:92%;} +// #footer renamed to #bromley-footer, image removed from background, width removed for no scrollbar, fixed font size. +#bromley-footer { background: #666; clear: both; padding:15px 15px 50px; margin-left:-15px; color:#fff; font-size:11px;} #bromley-footer a:link, #bromley-footer a:visited { color: #fff; text-decoration: none; } #bromley-footer a:hover, @@ -43,3 +51,15 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; #bromley-footer .footer-nav li { border-right:1px solid #fff; float: left; line-height: 1; padding: 0 20px; } #bromley-footer .footer-nav li:last-child { border: none; } +// mySociety additions +#bromley-header { font-size: 12px; } +.header-nav ul { margin: 0; } +.header-nav li { list-style-type: none; } +.main-menu ul { margin: 0; } +.main-menu li { list-style-type: none; } +#search input { display: inline; margin: 0; @include border-radius(0em); } +#search input.button { font-weight: normal; text-transform: none; } +#bromley-footer { margin: 1em 0 0; } +#bromley-footer .footer-nav li { list-style-type: none; } +#bromley-footer p { margin: 0; } + diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index 278e80176..9d9679aee 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -7,10 +7,30 @@ body { #front-main { background: $primary; - // layout sets this because base has it slightly lighter h2 { color: $primary_text; } } +// Don't want FixMyStreet logo on desktop, and we have a skip to content in +// Bromley header +#site-header { + display: none; +} + +// Currently hiding, but do want some internal navigation somewhere at the end +.nav-wrapper { + display: none; +} + +// Bit of extra spacing needed under Bromley header +body.frontpage .table-cell .content { + margin-top: 15em; +} + +// White background, so no shadow needed (unless map goes full screen, so +// JavaScript should put it in at that point? Or just put it on all map pages? +.content { + @include box-shadow(none); +} diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 8a284656c..37aab4653 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -920,6 +920,7 @@ body.frontpage { border-right:1em solid #fff; #front_stats { background:none; + color: #222; border-top:0.25em solid $primary; padding-top:1em; div { |