aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Angell <jbangell@gmail.com>2012-03-13 14:39:47 +0000
committerJosh Angell <jbangell@gmail.com>2012-03-13 14:39:47 +0000
commitc863b2b5f21af3dd1ee686ad23793c78dbf3e4ad (patch)
treea682832b11ced2195373ebcc6d152d4c2bda97ba
parent477cbe20daf95c34ca7382701c0c8e74eb894de4 (diff)
parentcca10b9222072ac3404a6291a84b0318cc95c647 (diff)
Merge branch 'supercool' of github.com:mysociety/fixmystreet into supercool
-rw-r--r--templates/web/fixmystreet/footer.html4
-rw-r--r--web/cobrands/fixmystreet/base.scss2
-rw-r--r--web/cobrands/fixmystreet/layout.scss4
3 files changed, 5 insertions, 5 deletions
diff --git a/templates/web/fixmystreet/footer.html b/templates/web/fixmystreet/footer.html
index 93e88dcc2..5ac9c881d 100644
--- a/templates/web/fixmystreet/footer.html
+++ b/templates/web/fixmystreet/footer.html
@@ -12,7 +12,7 @@
</ul>
</div>
- <div id="footer-ads">
+ <div id="footer-help">
<ul>
<li>
<h4>[% loc('Are you a developer?') %]</h4>
@@ -59,4 +59,4 @@
<!-- [% INCLUDE 'debug_footer.html' %] -->
</div> <!-- .wrapper -->
</body>
-</html> \ No newline at end of file
+</html>
diff --git a/web/cobrands/fixmystreet/base.scss b/web/cobrands/fixmystreet/base.scss
index a900c4331..8def019c3 100644
--- a/web/cobrands/fixmystreet/base.scss
+++ b/web/cobrands/fixmystreet/base.scss
@@ -662,7 +662,7 @@ p.label-valid {
}
}
-#footer-ads {
+#footer-help {
ul {
@include list-reset-soft;
li {
diff --git a/web/cobrands/fixmystreet/layout.scss b/web/cobrands/fixmystreet/layout.scss
index 180d155b4..b909e0e83 100644
--- a/web/cobrands/fixmystreet/layout.scss
+++ b/web/cobrands/fixmystreet/layout.scss
@@ -444,7 +444,7 @@ body.twothirdswidthpage {
}
}
-#footer-ads {
+#footer-help {
border-left:1em solid #fff;
ul {
display:table;
@@ -458,7 +458,7 @@ body.twothirdswidthpage {
}
}
.ie6, .ie7 {
- #footer-ads {
+ #footer-help {
margin-left:2%;
ul {
width:100%;