diff options
-rw-r--r-- | web/cobrands/barnet/_colours.scss | 8 | ||||
-rw-r--r-- | web/cobrands/barnet/layout.scss | 1 | ||||
-rw-r--r-- | web/cobrands/bromley/_colours.scss | 11 | ||||
-rw-r--r-- | web/cobrands/default/_colours.scss | 13 | ||||
-rw-r--r-- | web/cobrands/default/layout.scss | 4 | ||||
-rw-r--r-- | web/cobrands/fixmybarangay/_colours.scss | 7 | ||||
-rw-r--r-- | web/cobrands/fixmybarangay/message_manager.scss | 4 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_base.scss | 8 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_colours.scss | 12 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_layout.scss | 8 | ||||
-rw-r--r-- | web/cobrands/stevenage/_colours.scss | 6 | ||||
-rw-r--r-- | web/cobrands/zurich/_colours.scss | 9 |
12 files changed, 56 insertions, 35 deletions
diff --git a/web/cobrands/barnet/_colours.scss b/web/cobrands/barnet/_colours.scss index 2f5ccc42b..793a8dcdd 100644 --- a/web/cobrands/barnet/_colours.scss +++ b/web/cobrands/barnet/_colours.scss @@ -4,6 +4,8 @@ $primary: #E9E9EA; $primary_b: #000000; $primary_text: #3E3D44; -$contrast1: #E1E3E4; -$contrast1_dark: darken(#E1E3E4, 10%); -$contrast2: #AA8D11; +$col_click_map: #E1E3E4; +$col_click_map_dark: darken(#E1E3E4, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss index a2270c6f2..3ea439dea 100644 --- a/web/cobrands/barnet/layout.scss +++ b/web/cobrands/barnet/layout.scss @@ -246,7 +246,6 @@ ol.big-numbers > li::before { } p#fixed { padding-top: 4em; - background: #00BD08; } } diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss index e178c9db2..208154370 100644 --- a/web/cobrands/bromley/_colours.scss +++ b/web/cobrands/bromley/_colours.scss @@ -1,9 +1,12 @@ /* COLOURS */ -$primary: rgb(91,120,147); +$bromley_blue: rgb(91,120,147); + +$primary: $bromley_blue; $primary_b: #000000; $primary_text: #ffffff; -$contrast1: rgb(91,120,147); -$contrast1_dark: darken(rgb(91,120,147), 10%); -$contrast2: #AA8D11; +$col_click_map: $bromley_blue; +$col_click_map_dark: darken($bromley_blue, 10%); +$col_fixed_label: $bromley_blue; +$col_fixed_label_dark: darken($bromley_blue, 10%); diff --git a/web/cobrands/default/_colours.scss b/web/cobrands/default/_colours.scss index 2c044a6e7..147fb70f2 100644 --- a/web/cobrands/default/_colours.scss +++ b/web/cobrands/default/_colours.scss @@ -1,9 +1,14 @@ /* COLOURS */ -$primary: #ff9900; +$orange: #ff9900; +$bluey: #6688ff; + +$primary: $orange; $primary_b: #000000; $primary_text: #222222; -$contrast1: #6688ff; -$contrast1_dark: darken(#6688ff, 10%); -$contrast2: #AA8D11; +$col_click_map: $bluey; +$col_click_map_dark: darken($bluey, 10%); + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/default/layout.scss b/web/cobrands/default/layout.scss index 0365e4539..7e33d3f1f 100644 --- a/web/cobrands/default/layout.scss +++ b/web/cobrands/default/layout.scss @@ -9,13 +9,13 @@ and similar. */ body { - background: #6688ff; + background: $bluey; } body.mappage { .nav-wrapper { .nav-wrapper-2 { - background: $contrast1; + background: $bluey; } } } diff --git a/web/cobrands/fixmybarangay/_colours.scss b/web/cobrands/fixmybarangay/_colours.scss index fcaba8924..2e9b1affa 100644 --- a/web/cobrands/fixmybarangay/_colours.scss +++ b/web/cobrands/fixmybarangay/_colours.scss @@ -4,6 +4,7 @@ $primary: #fff; //E6DBD6 $primary_b: #000000; $primary_text: #222222; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/fixmybarangay/message_manager.scss b/web/cobrands/fixmybarangay/message_manager.scss index d2b7739c2..c2d4d9774 100644 --- a/web/cobrands/fixmybarangay/message_manager.scss +++ b/web/cobrands/fixmybarangay/message_manager.scss @@ -146,8 +146,8 @@ p.mm-submitted-by-sms { &.msg-is-busy { background-color: #ffd;} &.msg-is-owned { background-color: #dfd;} &.msg-is-active { - background-color: $contrast1; color:#fff; - p:hover { background-color: $contrast1; color:#fff; } // fix for mouseover on p + background-color: $col_click_map; color:#fff; + p:hover { background-color: $col_click_map; color:#fff; } // fix for mouseover on p p.mm-reply:hover {background-color: #eef; color:#000;} // fix for mouseover on p } span.msg-tag { diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index 189db4222..bd3704293 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -759,7 +759,7 @@ a:hover.button-left { position: relative; z-index:1000; top:-1.75em; - background: $contrast1; + background: $col_click_map; color: #fff; padding:1em; text: { @@ -775,7 +775,7 @@ a:hover.button-left { width: 0; height: 0; border-left: 0.5em solid transparent; - border-bottom: 0.5em solid $contrast1_dark; + border-bottom: 0.5em solid $col_click_map_dark; } } @@ -809,9 +809,9 @@ a:hover.button-left { } &#fixed { color:#fff; - background: $contrast1; + background: $col_fixed_label; &:before { - border-bottom: 0.5em solid $contrast1_dark; + border-bottom: 0.5em solid $col_fixed_label_dark; } } } diff --git a/web/cobrands/fixmystreet/_colours.scss b/web/cobrands/fixmystreet/_colours.scss index 1a62d0282..7dcd9ab9b 100644 --- a/web/cobrands/fixmystreet/_colours.scss +++ b/web/cobrands/fixmystreet/_colours.scss @@ -1,9 +1,13 @@ /* COLOURS */ $primary: #FFD000; -$primary_b: #F3B11E; +$primary_b: #F3B11E; // For the box around the front page postcode form only $primary_text: #222; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; +// The "Click map" box on /around +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; + +// The "fixed" message on a report page +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/fixmystreet/_layout.scss b/web/cobrands/fixmystreet/_layout.scss index c0271062e..075605a1d 100644 --- a/web/cobrands/fixmystreet/_layout.scss +++ b/web/cobrands/fixmystreet/_layout.scss @@ -639,14 +639,14 @@ body.twothirdswidthpage { margin-left:-2em; font-size:1.375em; padding:1em 3em 1em 1em; - background: $contrast1 url(/cobrands/fixmystreet/images/sprite.png) right -2188px no-repeat; + background: $col_click_map url(/cobrands/fixmystreet/images/sprite.png) right -2188px no-repeat; &:before { right:0; left:auto; top:-0.5em; position: absolute; border-top: 0.5em solid transparent; - border-left: 0.5em solid $contrast1_dark; + border-left: 0.5em solid $col_click_map_dark; border-bottom:none; } span { @@ -656,7 +656,7 @@ body.twothirdswidthpage { } } .ie6 .big-green-banner { - background: $contrast1 url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; + background: $col_click_map url(/cobrands/fixmystreet/images/ie_green_chevron.gif) right center no-repeat; } .banner { @@ -675,7 +675,7 @@ body.twothirdswidthpage { background-position:-324px -326px; background-repeat:no-repeat; &:before { - border-bottom: 0.75em solid $contrast1_dark; + border-bottom: 0.75em solid $col_fixed_label_dark; } } } diff --git a/web/cobrands/stevenage/_colours.scss b/web/cobrands/stevenage/_colours.scss index 72027c302..7e0325f88 100644 --- a/web/cobrands/stevenage/_colours.scss +++ b/web/cobrands/stevenage/_colours.scss @@ -7,4 +7,8 @@ $primary_text: #333; $contrast1: #00BD08; $contrast1_dark: #4B8304; -$contrast2: #AA8D11; + +$col_click_map: $contrast1; +$col_click_map_dark: $contrast1_dark; +$col_fixed_label: $contrast1; +$col_fixed_label_dark: $contrast1_dark; diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss index 1a62d0282..b8580be2d 100644 --- a/web/cobrands/zurich/_colours.scss +++ b/web/cobrands/zurich/_colours.scss @@ -4,6 +4,9 @@ $primary: #FFD000; $primary_b: #F3B11E; $primary_text: #222; -$contrast1: #00BD08; -$contrast1_dark: #4B8304; -$contrast2: #AA8D11; +$col_click_map: #00BD08; +$col_click_map_dark: #4B8304; + +$col_fixed_label: #00BD08; +$col_fixed_label_dark: #4B8304; + |