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

Conflicts:
	templates/web/default/report/display.html

1 files changed, 0 insertions, 46 deletions

diff --git a/web/css/main-scambs.css b/web/css/main-scambs.css
deleted file mode 100644
index 52f01ffcf..000000000
--- a/web/css/main-scambs.css
+++ /dev/null
@@ -1,46 +0,0 @@
-ul#error {
-    padding-top: 4px;
-    padding-bottom: 4px;
-}
-
-blockquote {
-    border-left: solid 4px #013B63;
-}
-
-.a {
-    color: #000000;
-    background-color: #427499;
-}
-
-#postcodeForm, #front_stats div {
-    background-color: #427499;
-    color: #ffffff;
-}
-
-#front_stats div {
-    padding: 0.5em 0;
-    width: 7em;
-}
-
-/* Smaller map */
-#map_box {
-    width: 380px;
-}
-#map, #drag {
-    width: 378px;
-    height: 378px;
-}
-#watermark {
-    display: none;
-    background: url("/i/mojwatermark-378.png");
-    height: 84px;
-    width: 171px;
-    position: absolute;
-    bottom: 0;
-    right: 0;
-}
-
-#fixed, #unknown {
-    margin-right: 400px;
-}
-