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

Conflicts:
	perllib/FixMyStreet/App/Controller/Report/Update.pm
	templates/web/default/report/display.html

1 files changed, 28 insertions, 7 deletions

diff --git a/web/css/_main.scss b/web/css/_main.scss
index 44fd82b3b..0b9cf33ab 100644
--- a/web/css/_main.scss
+++ b/web/css/_main.scss
@@ -79,7 +79,23 @@ select, input, textarea {
 
 /* Can't put the margin in #mysociety because of above IE craziness */
 #wrapper {
-    margin: 2em;
+    margin: 1em 2em 2em;
+}
+
+#meta {
+    list-style-type: none;
+    margin: 0.25em 0 0 1em;
+    padding: 0;
+    font-size: 0.875em;
+    li {
+        display: inline;
+        margin: 0;
+        padding: 0 0 0 0.25em;
+        border-left: solid 1px $header_colour;
+    }
+    li:first-child {
+        border-left: none;
+    }
 }
 
 .v {
@@ -111,6 +127,12 @@ select, input, textarea {
     a:hover, a:active {
         background-color: $header_colour;
         color: $header_back;
+        -moz-border-radius-topleft: 0.5em;
+        -webkit-border-top-left-radius: 0.5em;
+        border-radius-top-left: 0.5em;
+        -moz-border-radius-topright: 0.5em;
+        -webkit-border-top-right-radius: 0.5em;
+        border-radius-top-right: 0.5em;
     }
 }
 
@@ -129,11 +151,10 @@ select, input, textarea {
 
 #footer {
     clear: both;
-    text-align: right;
-    font-size: 83%;
-    border-top: solid 1px $header_colour;
-    display: table;
-    margin: 2em 0 1em auto;
-    padding: 2px 4px;
+    text-align: center;
+    border-top: solid 2px $header_back;
+    width: 50%;
+    margin: 2em auto 0;
+    padding: 1em;
 }