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

2 files changed, 33 insertions, 6 deletions

diff --git a/web/css/_main.scss b/web/css/_main.scss
index 9063f1484..19d9b5a40 100644
--- a/web/css/_main.scss
+++ b/web/css/_main.scss
@@ -83,11 +83,12 @@ select, input, textarea {
     position: relative;
     margin: 0 auto;
     max-width: 60em;
+    overflow: auto;
 }
 
 /* Can't put the margin in #mysociety because of above IE craziness */
 #wrapper {
-    margin: 1em 2em 2em;
+    margin: 1em 2em;
 }
 
 #meta {
@@ -162,7 +163,20 @@ select, input, textarea {
     text-align: center;
     border-top: solid 2px $header_back;
     width: 50%;
-    margin: 2em auto 0;
-    padding: 1em;
+    margin: 1em auto 0;
+    padding: 0;
+    color: $header_darker;
+
+    .l, .r {
+        margin-top: 0;
+        text-align: left;
+        width: 45%;
+    }
+    .l {
+        float: left;
+    }
+    .r {
+        float: right;
+    }
 }
 
diff --git a/web/css/main.css b/web/css/main.css
index 5b4be5ebc..65fd5eae3 100644
--- a/web/css/main.css
+++ b/web/css/main.css
@@ -80,11 +80,12 @@ select, input, textarea {
   position: relative;
   margin: 0 auto;
   max-width: 60em;
+  overflow: auto;
 }
 
 /* Can't put the margin in #mysociety because of above IE craziness */
 #wrapper {
-  margin: 1em 2em 2em;
+  margin: 1em 2em;
 }
 
 #meta {
@@ -157,6 +158,18 @@ select, input, textarea {
   text-align: center;
   border-top: solid 2px #e3d595;
   width: 50%;
-  margin: 2em auto 0;
-  padding: 1em;
+  margin: 1em auto 0;
+  padding: 0;
+  color: #4e451b;
+}
+#footer .l, #footer .r {
+  margin-top: 0;
+  text-align: left;
+  width: 45%;
+}
+#footer .l {
+  float: left;
+}
+#footer .r {
+  float: right;
 }