aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2012-02-28 12:42:57 +0000
committerMatthew Somerville <matthew@mysociety.org>2012-02-28 12:42:57 +0000
commitbf37b3a9e5c002ad69abb9f66fd6b484b6e7e1b4 (patch)
tree8280e6c666249297eaaba405efaa61246a712280
parent480d7f31be98f08dbb6fe41c772f59a7e4a06123 (diff)
parentda7a1a6ec8f65b6fa669d8f2b3f89dce9851cbd6 (diff)
Merge remote branch 'github/supercool' into supercool
-rw-r--r--templates/web/fixmystreet/footer.html2
-rw-r--r--web/cobrands/fixmystreet/layout.scss14
2 files changed, 15 insertions, 1 deletions
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html
index a35f475ae..93e88dcc2 100644
--- a/templates/web/fixmystreet/footer.html
+++ b/templates/web/fixmystreet/footer.html
@@ -41,7 +41,7 @@
</ul>
<ul id="main-menu">
- <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/"[% END
+ <li><[% IF c.req.uri.path == '/' %]span[% ELSE %]a href="/" class="report-a-problem-btn"[% END
%]>[% loc("Report a problem") %]</[% c.req.uri.path == '/' ? 'span' : 'a' %]></li>[%
%]<li><[% IF c.req.uri.path == '/my' %]span[% ELSE %]a href="/my"[% END
%]>[% loc("Your reports") %]</[% c.req.uri.path == '/my' ? 'span' : 'a' %]></li>[%
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 46f88be92..5b3d96bd1 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -139,6 +139,16 @@ body {
background:#444;
@include background(linear-gradient(#000, #444 10%, #444 95%, #111));
}
+ a.report-a-problem-btn {
+ background:$primary;
+ padding:0.25em;
+ margin:0.5em;
+ color:#333;
+ @include border-radius(0.25em);
+ &:hover {
+ background:$primary/0.9;
+ }
+ }
span {
color:$primary;
}
@@ -206,6 +216,10 @@ body.mappage {
#main-nav ul#main-menu li span {
padding: 1.4em 0.75em 1.35em 0.75em;
}
+ #main-nav ul#main-menu li a.report-a-problem-btn {
+ padding: 0.5em;
+ margin:0.9em 0.25em 0.85em 0.25em;
+ }
.nav-wrapper{
.nav-wrapper-2{
position: fixed;