Merge branch 'master' of ssh://git.mysociety.org/data/git/public/fixmystreet into new_statuses

Conflicts:
	perllib/FixMyStreet/App/Controller/Admin.pm
	perllib/FixMyStreet/App/Controller/JSON.pm
	perllib/FixMyStreet/Map/Tilma/Original.pm
	web/css/core.css

4 files changed, 29 insertions, 2 deletions

diff --git a/web/css/_main.scss b/web/css/_main.scss
index 0b9cf33ab..9063f1484 100644
--- a/web/css/_main.scss
+++ b/web/css/_main.scss
@@ -41,6 +41,14 @@ select, input, textarea {
     #front_stats div {
         background-color: $header_back;
     }
+    
+    p.promo {
+        border-top:    1px solid #bbb;
+        border-bottom: 1px solid #bbb;
+        background-color: #eee;
+        text-align: center;
+        padding: 0 0.5em;
+    }
 
 }
 
diff --git a/web/css/core.css b/web/css/core.css
index cb35000cd..aeab2b79b 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -34,7 +34,9 @@
 #mysociety #advert_thin {
   width: 50%;
   margin: 1em auto;
-  border-top: dotted 1px #999999; }
+  text-align: center;
+  border-top: dotted 1px #999999;
+}
 #mysociety #advert_hfymp {
   border-top: dotted 1px #999999;
   text-align: center; }
@@ -238,7 +240,11 @@
   margin: 0; }
 #mysociety #nearby_lists h2 {
   margin-top: 0.5em;
-  margin-bottom: 0; }
+  margin-bottom: 0;
+}
+#mysociety #nearby_lists li small {
+  color: #666666;
+}
 #mysociety #alert_links {
   float: right; }
 #mysociety #alert_links_area {
diff --git a/web/css/core.scss b/web/css/core.scss
index d845d6de4..691d70f91 100644
--- a/web/css/core.scss
+++ b/web/css/core.scss
@@ -66,6 +66,7 @@ $map_width: 500px;
     #advert_thin {
         width: 50%;
         margin: 1em auto;
+        text-align: center;
         border-top: dotted 1px #999999;
     }
     #advert_hfymp {
@@ -354,6 +355,11 @@ $map_width: 500px;
         margin-top: 0.5em;
         margin-bottom: 0;
     }
+
+    #nearby_lists li small {
+        color: #666666;
+    }
+
     #alert_links {
         float: right;
     }
diff --git a/web/css/main.css b/web/css/main.css
index 686b74d40..5b4be5ebc 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -43,6 +43,13 @@ select, input, textarea {
 #mysociety #front_stats div {
   background-color: #e3d595;
 }
+#mysociety p.promo {
+  border-top: 1px solid #bbb;
+  border-bottom: 1px solid #bbb;
+  background-color: #eee;
+  text-align: center;
+  padding: 0 0.5em;
+}
 
 #header {
   font-size: 200%;