diff options
author | Matthew Somerville <matthew@mysociety.org> | 2012-12-07 13:25:37 +0000 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2012-12-07 13:25:37 +0000 |
commit | 2323bc1a34ee85267e410bcc0ea5922054fa8bbc (patch) | |
tree | 8cd497f96bdca07f27acadbc5307750970d64498 | |
parent | 884612732c98d299b8b2cf20b501b9f1be987761 (diff) |
Fixes to current Zurich navigation display, footer indent, colour tweak.
-rw-r--r-- | templates/web/zurich/footer.html | 2 | ||||
-rw-r--r-- | web/cobrands/zurich/_colours.scss | 6 | ||||
-rw-r--r-- | web/cobrands/zurich/_zurich.scss | 1 | ||||
-rw-r--r-- | web/cobrands/zurich/layout.scss | 29 |
4 files changed, 34 insertions, 4 deletions
diff --git a/templates/web/zurich/footer.html b/templates/web/zurich/footer.html index aa33428aa..2e4717360 100644 --- a/templates/web/zurich/footer.html +++ b/templates/web/zurich/footer.html @@ -6,7 +6,7 @@ <div class="nav-wrapper-2"> <div id="main-nav" role="navigation"> <ul id="main-menu"> - <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] class="report-a-problem-btn" + <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END %] >[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[% %]<li><[% IF c.req.uri.path == '/reports' %]span[% ELSE %]a href="/reports"[% END %]>[% loc("All reports") %]</[% c.req.uri.path == '/reports' ? 'span' : 'a' %]></li>[% diff --git a/web/cobrands/zurich/_colours.scss b/web/cobrands/zurich/_colours.scss index 4317cedfe..8e8f4c9cd 100644 --- a/web/cobrands/zurich/_colours.scss +++ b/web/cobrands/zurich/_colours.scss @@ -3,12 +3,12 @@ $dark_blue: rgb(50, 80, 165); $lighter_blue: rgb(57, 94, 147); -$primary: $dark_blue; +$primary: $lighter_blue; $primary_b: $dark_blue; $primary_text: #fff; -$col_click_map: #00BD08; -$col_click_map_dark: #4B8304; +$col_click_map: $lighter_blue; +$col_click_map_dark: darken($lighter_blue, 20%); $col_fixed_label: #00BD08; $col_fixed_label_dark: #4B8304; diff --git a/web/cobrands/zurich/_zurich.scss b/web/cobrands/zurich/_zurich.scss index 66c1003a4..49bdbc187 100644 --- a/web/cobrands/zurich/_zurich.scss +++ b/web/cobrands/zurich/_zurich.scss @@ -10,6 +10,7 @@ a:hover { #zurich-footer { margin-top: 1em; // mySociety + margin-left: 12px; // mySociety font-size: 67.5%; line-height: 1.5em; clear: both; diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index 07d55aadf..a882d331d 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -40,9 +40,38 @@ body.mappage { .nav-wrapper { .nav-wrapper-2 { border-top: none; + padding-top: 18px; background: url(logo_portal.x.jpg) top left repeat-x; height: 83px; } } } +#main-nav { + ul#main-menu { + li { + a:hover { + background: $primary/1.1; + } + span { + color: $primary_text; + } + } + } +} + +body.mappage { + #main-nav ul#main-menu li a, + #main-nav ul#main-menu li span { + padding: 0.75em; + } +} + +body.twothirdswidthpage { + .content { + aside { + @include box-shadow(none); + } + } +} + |