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

Conflicts:
	web/css/core.css

4 files changed, 0 insertions, 25 deletions

diff --git a/web/css/core.css b/web/css/core.css
index 4dd0a974b..ac29dfe7a 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -131,13 +131,6 @@
   margin-bottom: 30px; }
 #mysociety #category_meta label {
   width: 10em; }
-#mysociety #watermark {
-  background: url("/i/mojwatermark6.png");
-  height: 113px;
-  width: 231px;
-  position: absolute;
-  bottom: 0;
-  right: 0; }
 #mysociety #map_box {
   float: right;
   width: 502px;
diff --git a/web/css/core.scss b/web/css/core.scss
index 4fbc6aaca..4e8d732d5 100644
--- a/web/css/core.scss
+++ b/web/css/core.scss
@@ -216,15 +216,6 @@ $map_width: 500px;
 
     // Map
 
-    #watermark {
-        background: url("/i/mojwatermark6.png");
-        height: 113px;
-        width: 231px;
-        position: absolute;
-        bottom: 0;
-        right: 0;
-    }
-
     #map_box {
         float: right;
         width: $map_width + 2px;
diff --git a/web/css/ie6-378.css b/web/css/ie6-378.css
deleted file mode 100644
index 83efdb634..000000000
--- a/web/css/ie6-378.css
+++ /dev/null
@@ -1,4 +0,0 @@
-#mysociety #watermark {
-    background: none;
-    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/i/mojwatermark-378.png',sizingMethod='scale');
-}
diff --git a/web/css/ie6.css b/web/css/ie6.css
index 3bb91aa31..fd3e26047 100644
--- a/web/css/ie6.css
+++ b/web/css/ie6.css
@@ -1,8 +1,3 @@
-#mysociety #watermark {
-    background: none;
-    filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/i/mojwatermark6.png',sizingMethod='scale');
-}
-
 #logo {
     display: none;
 }