diff options
Diffstat (limited to 'web')
-rw-r--r-- | web/cobrands/bromley/_colours.scss | 2 | ||||
-rw-r--r-- | web/cobrands/bromley/base.scss | 14 | ||||
-rw-r--r-- | web/cobrands/bromley/bromley.scss | 23 | ||||
-rw-r--r-- | web/cobrands/bromley/layout.scss | 5 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/_base.scss | 1 | ||||
-rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 25 |
6 files changed, 30 insertions, 40 deletions
diff --git a/web/cobrands/bromley/_colours.scss b/web/cobrands/bromley/_colours.scss index c0376274e..b76a37609 100644 --- a/web/cobrands/bromley/_colours.scss +++ b/web/cobrands/bromley/_colours.scss @@ -4,5 +4,5 @@ $primary: rgb(76,120,168); $primary_b: #000000; $primary_text: #ffffff; -$contrast1: #00BD08; +$contrast1: rgb(76,120,168); $contrast2: #AA8D11; diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 710078118..36815e6e5 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -27,3 +27,17 @@ background: url('/cobrands/bromley/bromley-logo.s.jpg') 0 0 no-repeat; } +#problems-nav { + border-bottom:0.25em solid $primary; + ul li a { + text-transform: none; + &.active { + background: $primary; + color: #fff; + } + } +} + +.big-green-banner { + text-transform: none; +} diff --git a/web/cobrands/bromley/bromley.scss b/web/cobrands/bromley/bromley.scss index 0f4879bef..89ab08fd1 100644 --- a/web/cobrands/bromley/bromley.scss +++ b/web/cobrands/bromley/bromley.scss @@ -83,26 +83,3 @@ body { color: #333; font-family: Arial, 'Helvetica Neue', Helvetica, sans-serif; text-align: right; } -#main-menu { - text-align: center; - margin: 2em 0; - padding: 0; - li { - margin: 0; - padding: 0; - display: inline; - a, span { - padding: 1em; - color: #000; - background: #eef; - @include background(linear-gradient(#eef, #eee)); - } - span { - text-decoration: underline; - } - } - a:hover { - background: #ccf; - } -} - diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index 6c2ded2fc..e74aab1a3 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -17,12 +17,17 @@ body { #front-main { background: $primary; + @include border-radius(1em 1em 0 0); // layout sets this because base has it slightly lighter h2 { color: $primary_text; } } +.tablewrapper { + padding-top: 1em; +} + // Don't want gap that normal site has body.frontpage { .table-cell { diff --git a/web/cobrands/fixmystreet/_base.scss b/web/cobrands/fixmystreet/_base.scss index 5fd87a454..c453da80c 100644 --- a/web/cobrands/fixmystreet/_base.scss +++ b/web/cobrands/fixmystreet/_base.scss @@ -142,6 +142,7 @@ img { //do this otherwise IE will just not display //any img without a height defined height:auto; + max-width: 100%; } select, input, textarea { diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 47f5da820..be5be08cb 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -105,24 +105,17 @@ $(function(){ $html.removeClass('mobile'); if (cobrand == 'bromley') { var $window = $(window), $content = $('.content'), o = $content.offset(); + var map_height = $window.height() - o.top; if ($html.hasClass('ie6')) { - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: 'absolute', - right: 0, top: '1em', - width: $window.width() - o.left - $content.outerWidth(), - height: $window.height() - o.top + 32, - margin: 0 - }); - } else { - var map_height = $window.height() - o.top; - $('#map_box').prependTo('.wrapper').css({ - zIndex: 0, position: 'fixed', - right: 0, top: o.top, bottom: 0, left: 'auto', - width: $window.width() - o.left - $content.outerWidth(), - height: map_height, - margin: 0 - }); + map_height = $window.height() - o.top + 32; } + $('#map_box').prependTo('.wrapper').css({ + zIndex: 0, position: 'absolute', + right: 0, top: '1em', + width: $window.width() - o.left - $content.outerWidth(), + height: map_height, + margin: 0 + }); } else if ($html.hasClass('ie6')) { $('#map_box').prependTo('.wrapper').css({ zIndex: 0, position: 'absolute', |