diff options
Diffstat (limited to 'web/cobrands/bexley')
| -rw-r--r-- | web/cobrands/bexley/_colours.scss | 8 | ||||
| -rw-r--r-- | web/cobrands/bexley/assets.js | 26 | ||||
| -rw-r--r-- | web/cobrands/bexley/base.scss | 2 | ||||
| -rw-r--r-- | web/cobrands/bexley/layout.scss | 47 |
4 files changed, 54 insertions, 29 deletions
diff --git a/web/cobrands/bexley/_colours.scss b/web/cobrands/bexley/_colours.scss index 615ef65a4..4b78a39f7 100644 --- a/web/cobrands/bexley/_colours.scss +++ b/web/cobrands/bexley/_colours.scss @@ -40,9 +40,9 @@ $primary_text: $text_black; $base_bg: $white; $base_fg: $text_black; -$nav_background_colour: $fuchsia; -$nav_colour: $white; -$nav_hover_background_colour: darken($fuchsia, 10%); +$nav_background_colour: $white; +$nav_colour: $text_black; +$nav_hover_background_colour: $fuchsia_lt; $col_click_map: $aqua; @@ -51,3 +51,5 @@ $header-top-border: false; $heading-font: Lato, sans-serif; $body-font: Lato, sans-serif; $meta-font: $body-font; + +$search-help-background: #fff3f3; diff --git a/web/cobrands/bexley/assets.js b/web/cobrands/bexley/assets.js index 541d47ea4..db2384195 100644 --- a/web/cobrands/bexley/assets.js +++ b/web/cobrands/bexley/assets.js @@ -21,18 +21,10 @@ var defaults = { strategy_class: OpenLayers.Strategy.FixMyStreet }; -var streetlight_select = $.extend({ - label: "${Unit_No}", - labelOutlineColor: "white", - labelOutlineWidth: 3, - labelYOffset: 65, - fontSize: '15px', - fontWeight: 'bold' -}, fixmystreet.assets.style_default_select.defaultStyle); - var streetlight_stylemap = new OpenLayers.StyleMap({ 'default': fixmystreet.assets.style_default, - 'select': new OpenLayers.Style(streetlight_select) + 'hover': fixmystreet.assets.style_default_hover, + 'select': fixmystreet.assets.construct_named_select_style("${Unit_No}") }); var labeled_defaults = $.extend(true, {}, defaults, { @@ -45,18 +37,8 @@ var labeled_defaults = $.extend(true, {}, defaults, { UnitID: 'Unit_ID' }, actions: { - asset_found: function(asset) { - var id = asset.attributes[this.fixmystreet.feature_code] || ''; - if (id !== '') { - var asset_name = this.fixmystreet.asset_item; - $('.category_meta_message').html('You have selected ' + asset_name + ' <b>' + id + '</b>'); - } else { - $('.category_meta_message').html(this.fixmystreet.asset_item_message); - } - }, - asset_not_found: function() { - $('.category_meta_message').html(this.fixmystreet.asset_item_message); - } + asset_found: fixmystreet.assets.named_select_action_found, + asset_not_found: fixmystreet.assets.named_select_action_not_found } }); diff --git a/web/cobrands/bexley/base.scss b/web/cobrands/bexley/base.scss index 7132f33ab..0f72a2e34 100644 --- a/web/cobrands/bexley/base.scss +++ b/web/cobrands/bexley/base.scss @@ -39,7 +39,7 @@ small { .mobile-map-banner { font-size: 0.89em; } -#front-main a#geolocate_link { +a#geolocate_link { font-size: 0.89em; } #front_stats div { diff --git a/web/cobrands/bexley/layout.scss b/web/cobrands/bexley/layout.scss index 948b01443..c18574bd5 100644 --- a/web/cobrands/bexley/layout.scss +++ b/web/cobrands/bexley/layout.scss @@ -6,6 +6,10 @@ body.twothirdswidthpage .content .sticky-sidebar aside { top: 10em; } +#site-header { + border-top: 7px solid $fuchsia; +} + #site-logo { width: 208px; height: 80px; @@ -18,10 +22,47 @@ body.twothirdswidthpage .content .sticky-sidebar aside { color: $fuchsia_lt; } +.frontpage { + .nav-menu--main { + margin: 3em 0 0 0; + } +} + .nav-menu--main { - span { - background-color: $nav_hover_background_colour; - } + a { + &:hover, + &:active, + &:focus { + color: $text_black; + } + } + a.report-a-problem-btn, + span.report-a-problem-btn, + span { + background-color: $nav_hover_background_colour; + color: $text_black; + border-radius: 0; + &:hover { + color: $fuchsia; + cursor: pointer; + } + } + a[href='/auth'] { + position: absolute; + top: 0; + right: 1em; + .frontpage & { + right: 0; + } + background-color: $fuchsia; + color: $white; + padding: 0 0.75em; + &:hover, + &:active, + &:focus { + color: $white; + } + } } .general-notes { |