diff options
Diffstat (limited to 'web')
26 files changed, 23 insertions, 62 deletions
diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss index f03f97a13..c8792fd51 100644 --- a/web/cobrands/angus/base.scss +++ b/web/cobrands/angus/base.scss @@ -13,8 +13,6 @@ } #site-header { - background: $angus_green; - form.form__search { display: none; } diff --git a/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss index 0e3e3201e..0bce8f06d 100644 --- a/web/cobrands/angus/layout.scss +++ b/web/cobrands/angus/layout.scss @@ -12,7 +12,6 @@ $max_page_width: 1200px; } #site-header { - background-color: $angus_green; border-bottom: solid 8px $angus_dark_green; box-shadow: 0 5px 5px rgba(0, 0, 0, .075); diff --git a/web/cobrands/bristol/_colours.scss b/web/cobrands/bristol/_colours.scss index 97d57391d..02764ab43 100644 --- a/web/cobrands/bristol/_colours.scss +++ b/web/cobrands/bristol/_colours.scss @@ -23,7 +23,7 @@ $base_bg: white; $base_fg: $g1; $map_nav_bg: $g1; -$nav_fg: $b4; +$nav_fg: #fff; $nav_fg_hover: $primary; $header-top-border: false; diff --git a/web/cobrands/bristol/base.scss b/web/cobrands/bristol/base.scss index 0b8d6f621..8f61d2a5b 100644 --- a/web/cobrands/bristol/base.scss +++ b/web/cobrands/bristol/base.scss @@ -23,7 +23,6 @@ #site-header { border-bottom: solid 5px $bcc_red; - background: $g1; // Can't use background-color as it's ignored in favour of existing background } // Style the Bristol footer correctly diff --git a/web/cobrands/bristol/layout.scss b/web/cobrands/bristol/layout.scss index 9049e2da0..7000e8277 100644 --- a/web/cobrands/bristol/layout.scss +++ b/web/cobrands/bristol/layout.scss @@ -3,7 +3,6 @@ @import "../sass/layout"; #site-header { - background: $g1; border-bottom: none; } diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 8e3d01f7b..e6c29bed2 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -21,11 +21,6 @@ transform: none; } -// Change the colour and size of the site header to suit -#site-header { - background: $base_bg; -} - // Reset form placeholders so that they match Bromley's // input placeholders, these need to be on separate lines as if the browser // can't understand a selector it will invalidate the whole line. diff --git a/web/cobrands/eastherts/_colours.scss b/web/cobrands/eastherts/_colours.scss index 6266db6a3..dc5531627 100644 --- a/web/cobrands/eastherts/_colours.scss +++ b/web/cobrands/eastherts/_colours.scss @@ -14,7 +14,7 @@ $primary_text: #222222; $base_bg: white; $base_fg: $eh_dark_grey; -$map_nav_bg: $eh_green; +$map_nav_bg: $eh_blue; $nav_fg: #000; $nav_fg_hover: $primary; @@ -31,4 +31,4 @@ $col_fixed_label_dark: #4B8304; $body-font: Verdana,Arial,Helvetica,Geneva,sans-serif; $meta-font: $body-font; -$heading-font: $body-font;
\ No newline at end of file +$heading-font: $body-font; diff --git a/web/cobrands/eastherts/base.scss b/web/cobrands/eastherts/base.scss index d9401a47d..83350bdfa 100644 --- a/web/cobrands/eastherts/base.scss +++ b/web/cobrands/eastherts/base.scss @@ -8,10 +8,6 @@ display: none; } -#site-header { - background: $eh_blue; -} - #site-logo { background: url(img/toplogo.gif); background-size: 51px 48px; diff --git a/web/cobrands/eastherts/layout.scss b/web/cobrands/eastherts/layout.scss index eeb5cf0dc..a11f7ef72 100644 --- a/web/cobrands/eastherts/layout.scss +++ b/web/cobrands/eastherts/layout.scss @@ -1,10 +1,8 @@ @import "_colours"; @import "../sass/layout"; -#site-header, -body.mappage #site-header { - // default layout.scss sets this, so we need it here as well as base.scss - background: $eh_blue url(img/header_mid.jpg) 0 0 repeat-x; +#site-header { + background: $base_bg url(img/header_mid.jpg) 0 0 repeat-x; } body.fullwidthpage, body.twothirdswidthpage, body.authpage, body.frontpage { @@ -13,7 +11,6 @@ body.fullwidthpage, body.twothirdswidthpage, body.authpage, body.frontpage { $fms-nav-height: 43px; #site-header { - background-color: $base_bg; height: $logo-height + $eh-nav-height + $fms-nav-height; .container:first-child { diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index e8697a963..549d29540 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -68,6 +68,7 @@ h3, h4, @import "../sass/layout"; #site-header { + background: $map_nav_bg; padding: 1em 0; } diff --git a/web/cobrands/fixmystreet.com/layout.scss b/web/cobrands/fixmystreet.com/layout.scss index e34a6712e..d8ebf8d63 100644 --- a/web/cobrands/fixmystreet.com/layout.scss +++ b/web/cobrands/fixmystreet.com/layout.scss @@ -79,6 +79,7 @@ h3, h4, } #site-header { + background: none; border-image-source: url(images/tile-y-border.jpg); border-image-slice: 4 0 0; border-image-repeat: repeat; diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss index c117b1b80..2f2ebfa8c 100644 --- a/web/cobrands/greenwich/base.scss +++ b/web/cobrands/greenwich/base.scss @@ -6,9 +6,7 @@ @import "../sass/base"; @import "../sass/report_list_pins"; -body.frontpage #site-logo, -#site-logo -{ +#site-logo { background: url("/cobrands/greenwich/logo.gif") 0 50% no-repeat; background-size: contain; width: 82px; @@ -22,8 +20,7 @@ body.frontpage #site-logo, #site-header { - background-color: $base_bg; - background: url("/cobrands/greenwich/mastWave.gif") 0 0 no-repeat; + background: $base_bg url("/cobrands/greenwich/mastWave.gif") 100% 0 no-repeat; background-size: cover; } diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss index 7093f0138..e7832f374 100644 --- a/web/cobrands/greenwich/layout.scss +++ b/web/cobrands/greenwich/layout.scss @@ -43,8 +43,9 @@ body.twothirdswidthpage #site-logo } } -#site-header, -body.frontpage #site-header { +#site-header { + background: none; + .container { position: static; } @@ -146,8 +147,7 @@ body.frontpage { body.mappage { #site-header { - background: url("/cobrands/greenwich/mastWave.gif") 100% 0 no-repeat; - background-color: $base_bg; + background: $base_bg url("/cobrands/greenwich/mastWave.gif") 100% 0 no-repeat; background-size: contain; .container { diff --git a/web/cobrands/hart/base.scss b/web/cobrands/hart/base.scss index 8d903dc3d..62a4250f3 100644 --- a/web/cobrands/hart/base.scss +++ b/web/cobrands/hart/base.scss @@ -25,8 +25,6 @@ h1.main { } #site-header { - background: $primary; - .mobile-header-nav { height: 56px; float: right; diff --git a/web/cobrands/hart/layout.scss b/web/cobrands/hart/layout.scss index ecda2cc1f..8589a3281 100644 --- a/web/cobrands/hart/layout.scss +++ b/web/cobrands/hart/layout.scss @@ -18,7 +18,6 @@ body.twothirdswidthpage .content { } #site-header { - background-color: $hart_primary; margin-bottom: 2em; // To push main content down under abs. pos menu } diff --git a/web/cobrands/oxfordshire/_colours.scss b/web/cobrands/oxfordshire/_colours.scss index ba0597bb8..b332eb6da 100644 --- a/web/cobrands/oxfordshire/_colours.scss +++ b/web/cobrands/oxfordshire/_colours.scss @@ -15,8 +15,7 @@ $base_fg: #000; // Taken from the OCC website $oxfordshire_link_colour: #0c62ba; -/* Unused here */ -$map_nav_bg: #222; +$map_nav_bg: $oxfordshire_dk_green; $nav_fg: #fff; $nav_fg_hover: #444; diff --git a/web/cobrands/oxfordshire/base.scss b/web/cobrands/oxfordshire/base.scss index 033dcb0ff..55bd2f436 100644 --- a/web/cobrands/oxfordshire/base.scss +++ b/web/cobrands/oxfordshire/base.scss @@ -6,11 +6,6 @@ @import "../sass/top-banner"; @import "../sass/report_list_pins"; -#site-header { - background: none; - background-color: $oxfordshire_dk_green; -} - #site-logo { background: transparent url('images/logo.jpg') 0 50% no-repeat; width: 173px; diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 1c87bf95e..76db0efde 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -474,7 +474,8 @@ ul.error { @if ($header-top-border) { border-top: $header-top-border; } - @include linear-gradient(#000, #222 10%, #222 90%, #000); + color: $nav_fg; + background-color: $map_nav_bg; position: relative; } @@ -511,13 +512,13 @@ ul.error { font-size: 0.9em; line-height: 1em; border: 1px solid #666; - color: #fff; + color: $nav_fg; padding: 0.4em; border-radius: 0.3em; &:hover, &:focus { text-decoration: none; - background-color: #444; + background-color: $nav_fg_hover; } } diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 9a6b00139..3859f09f6 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -62,10 +62,6 @@ h1 { position: relative; } -#site-header { - background: none; -} - #main-nav { min-height: $mappage-header-height; // defaults to map header height; should be height of #site-header (eg: #site-logo + any vertical padding) @include flex-container(); @@ -178,7 +174,6 @@ body.mappage { left: 0; right: 0; height: $mappage-header-height; - background: $map_nav_bg; } #site-logo { diff --git a/web/cobrands/stevenage/_colours.scss b/web/cobrands/stevenage/_colours.scss index 62514b8f3..4ec7950ec 100644 --- a/web/cobrands/stevenage/_colours.scss +++ b/web/cobrands/stevenage/_colours.scss @@ -9,7 +9,7 @@ $primary_text: #fff; $base_bg: #dddddb; $base_fg: #222; -$map_nav_bg: #6b6969; +$map_nav_bg: #eee; $nav_fg: #fff; $nav_fg_hover: #444; diff --git a/web/cobrands/stevenage/base.scss b/web/cobrands/stevenage/base.scss index 677513f84..0eec2be99 100644 --- a/web/cobrands/stevenage/base.scss +++ b/web/cobrands/stevenage/base.scss @@ -8,10 +8,6 @@ $heading-font: 'PTSansCaptionRegular', "PT Sans Caption", Verdana, Arial, sans-s @import "../sass/base"; -#site-header { - background: #eee; -} - #site-logo { background: transparent; width: 82px; diff --git a/web/cobrands/warwickshire/_colours.scss b/web/cobrands/warwickshire/_colours.scss index 473d8cb03..8c2c41406 100644 --- a/web/cobrands/warwickshire/_colours.scss +++ b/web/cobrands/warwickshire/_colours.scss @@ -9,7 +9,7 @@ $primary_text: #222222; $base_bg: #F9FFF8; $base_fg: #000; -$map_nav_bg: $green; +$map_nav_bg: #fff; $nav_fg: #000; $nav_fg_hover: $primary; diff --git a/web/cobrands/warwickshire/base.scss b/web/cobrands/warwickshire/base.scss index 8bfa69e9f..24b01183e 100644 --- a/web/cobrands/warwickshire/base.scss +++ b/web/cobrands/warwickshire/base.scss @@ -39,8 +39,6 @@ body { } #site-header { - background: white; - nav ul li, ul.nav li { list-style: none; margin-bottom: 0; diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss index d05be2102..3bdbd7447 100644 --- a/web/cobrands/zurich/_colours.scss +++ b/web/cobrands/zurich/_colours.scss @@ -10,7 +10,7 @@ $primary_text: #fff; $base_bg: #fff; $base_fg: #3c3c3c; -$map_nav_bg: #fff; +$map_nav_bg: #366AB6; /* Unused here, main-nav is mobile only */ $nav_fg: $primary_text; $nav_fg_hover: $primary/1.1; @@ -23,3 +23,4 @@ $col_fixed_label_dark: #4B8304; $mobile_menu_tab_bg_col: #FFFFFF; // the white border and tab on mobile site $mobile_header_blue: #366AB6; // close match to Zurich logo_portal.jpg +$header-top-border: solid 0.25em $mobile_menu_tab_bg_col; diff --git a/web/cobrands/zurich/base.scss b/web/cobrands/zurich/base.scss index 357ef412a..3b13a93cf 100644 --- a/web/cobrands/zurich/base.scss +++ b/web/cobrands/zurich/base.scss @@ -50,10 +50,6 @@ } } -#site-header { - background: $mobile_header_blue; - border-top: 4px solid $mobile_menu_tab_bg_col; -} #site-logo-text { display: none; } diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index d2c4f71b5..f82fc0fc3 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -18,6 +18,7 @@ body.admin .admin-nav-wrapper { // Different header and logo #site-header { + background-color: #fff; border-top: none; margin-bottom: 2em; .container { |