diff options
author | Matthew Somerville <matthew@mysociety.org> | 2012-04-05 11:27:46 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2012-04-06 15:43:23 +0100 |
commit | 1955ed74bddc65fb1affd60a6ed388723319eea0 (patch) | |
tree | e4dbee7f3f2136f332b62c2ca96af998243095c7 /web | |
parent | 3afcf336344d548558242f153f4966d602e9b49f (diff) |
Fix banner corner colour (CM2), add pin explanation (CM9).
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/bromley/_colours.scss | 1 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_base.scss | 4 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_colours.scss | 1 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_layout.scss | 9 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 8 |
5 files changed, 17 insertions, 6 deletions
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss index b76a37609..0fc15782a 100644 --- a/web/cobrands/bromley/_colours.scss +++ b/web/cobrands/bromley/_colours.scss @@ -5,4 +5,5 @@ $primary_b: #000000; $primary_text: #ffffff; $contrast1: rgb(76,120,168); +$contrast1_dark: darken(rgb(76,120,168), 10%); $contrast2: #AA8D11; diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index c453da80c..b82e46246 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -724,7 +724,7 @@ a:hover.button-left { width: 0; height: 0; border-left: 0.5em solid transparent; - border-bottom: 0.5em solid #4B8304; + border-bottom: 0.5em solid $contrast1_dark; } } @@ -760,7 +760,7 @@ a:hover.button-left { color:#fff; background: $contrast1; &:before { - border-bottom: 0.5em solid #4B8304; + border-bottom: 0.5em solid $contrast1_dark; } } } diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet/_colours.scss index 2463cdeeb..1a62d0282 100644 --- a/web/cobrands/fixmystreet/_colours.scss +++ b/web/cobrands/fixmystreet/_colours.scss @@ -5,4 +5,5 @@ $primary_b: #F3B11E; $primary_text: #222; $contrast1: #00BD08; +$contrast1_dark: #4B8304; $contrast2: #AA8D11; diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index 57b26f42d..3c6d573e1 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -653,9 +653,14 @@ body.twothirdswidthpage { top:-0.5em; position: absolute; border-top: 0.5em solid transparent; - border-left: 0.5em solid #4B8304; + border-left: 0.5em solid $contrast1_dark; border-bottom:none; } + span { + display: block; + font-size: 80%; + padding-top: 0.5em; + } } .ie6 .big-green-banner { background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; @@ -677,7 +682,7 @@ body.twothirdswidthpage { background-position:-324px -326px; background-repeat:no-repeat; &:before { - border-bottom: 0.75em solid #4B8304; + border-bottom: 0.75em solid $contrast1_dark; } } } diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index be5be08cb..bc0ff1856 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -139,14 +139,18 @@ $(function(){ } if (typeof fixmystreet !== 'undefined' && fixmystreet.page == 'around') { // Remove full-screen-ness - if (cobrand != 'bromley') { + var banner_text; + if (cobrand == 'bromley') { + banner_text = 'Click map to report a problem<span>Yellow pins show existing reports</span>'; + } else { $('#site-header').show(); + banner_text = 'Click map to report a problem'; } $('#fms_pan_zoom').css({ top: '4.75em !important' }); $('.big-green-banner') .removeClass('mobile-map-banner') .prependTo('#side') - .text('Click map to report a problem'); + .html(banner_text); } $('span.report-a-problem-btn').css({ cursor:'' }).off('.reportBtn'); } |