aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/web/default/header.html4
-rw-r--r--templates/web/emptyhomes/header.html4
-rw-r--r--templates/web/fiksgatami/header.html3
-rw-r--r--templates/web/southampton/header.html7
-rw-r--r--web/cobrands/barnet/css/layout.css8
-rw-r--r--web/cobrands/emptyhomes/css.css8
-rw-r--r--web/css/core.css8
-rw-r--r--web/css/core.scss9
-rw-r--r--web/css/ie6-378.css4
-rw-r--r--web/css/ie6.css5
-rw-r--r--web/i/mojwatermark-378.pngbin5849 -> 0 bytes
-rw-r--r--web/i/mojwatermark6.pngbin11552 -> 0 bytes
12 files changed, 10 insertions, 50 deletions
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index 431e6db65..4030b537f 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -2,13 +2,13 @@
<html lang="[% lang_code %]">
<head>
- [% INCLUDE 'common_header_tags.html' %]
-
<style type="text/css">@import url("/css/core.css"); @import url("/css/main.css");</style>
<!--[if LT IE 7]>
<style type="text/css">@import url("/css/ie6.css");</style>
<![endif]-->
+ [% INCLUDE 'common_header_tags.html' %]
+
[% IF c.req.uri.host == 'osm.fixmystreet.com' %]
<link rel="canonical" href="http://www.fixmystreet.com[% c.req.uri.path_query %]">
[% END %]
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index ca51d8060..59d3db3e2 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -2,8 +2,6 @@
<html lang="[% lang_code %]">
<head>
-[% INCLUDE 'common_header_tags.html' %]
-
<style type="text/css">
@import "/css/core.css";
@import "/cobrands/emptyhomes/css.css";
@@ -12,6 +10,8 @@
<style type="text/css">@import url("/css/ie6.css");</style>
<![endif]-->
+[% INCLUDE 'common_header_tags.html' %]
+
</head>
<body>
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index e0bf5b150..c8e9bb1c9 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -1,12 +1,13 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
<html lang="[% lang_code %]">
<head>
- [% INCLUDE 'common_header_tags.html' %]
<style type="text/css">
@import url("/css/core.css");
@import url("/cobrands/fiksgatami/css.css");
</style>
+
+ [% INCLUDE 'common_header_tags.html' %]
</head>
<body>
diff --git a/templates/web/southampton/header.html b/templates/web/southampton/header.html
index 5d94d5bdf..049034252 100644
--- a/templates/web/southampton/header.html
+++ b/templates/web/southampton/header.html
@@ -1,12 +1,13 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
- [% INCLUDE 'common_header_tags.html' %]
- <script type="text/javascript" src="/js/southampton.js"></script>
-
<link rel="stylesheet" type="text/css" href="/css/core.css" />
<link rel="stylesheet" type="text/css" href="/cobrands/southampton/style.css" />
<link rel="stylesheet" type="text/css" href="/cobrands/southampton/css.css" />
+
+ [% INCLUDE 'common_header_tags.html' %]
+ <script type="text/javascript" src="/js/southampton.js"></script>
+
</head>
<body>
<ul id="topMenu">
diff --git a/web/cobrands/barnet/css/layout.css b/web/cobrands/barnet/css/layout.css
index 1445ff419..1e1bf5d05 100644
--- a/web/cobrands/barnet/css/layout.css
+++ b/web/cobrands/barnet/css/layout.css
@@ -7,14 +7,6 @@
width: 378px;
height: 378px;
}
-#mysociety #watermark {
- background: url("/i/mojwatermark-378.png");
- height: 84px;
- width: 171px;
- position: absolute;
- bottom: 0;
- right: 0;
-}
#mysociety p#fixed, #mysociety p#unknown {
margin-right: 400px;
diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css.css
index c45e9255f..168eae2de 100644
--- a/web/cobrands/emptyhomes/css.css
+++ b/web/cobrands/emptyhomes/css.css
@@ -7,14 +7,6 @@
width: 378px;
height: 378px;
}
-#watermark {
- background: url("/i/mojwatermark-378.png");
- height: 84px;
- width: 171px;
- position: absolute;
- bottom: 0;
- right: 0;
-}
p#fixed, p#unknown {
margin-right: 400px;
diff --git a/web/css/core.css b/web/css/core.css
index d468f097d..6dc75e6a1 100644
--- a/web/css/core.css
+++ b/web/css/core.css
@@ -160,14 +160,6 @@
clear: none;
margin-bottom: 1em;
}
-#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 22bdc3d2e..55fda5a31 100644
--- a/web/css/core.scss
+++ b/web/css/core.scss
@@ -208,15 +208,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;
}
diff --git a/web/i/mojwatermark-378.png b/web/i/mojwatermark-378.png
deleted file mode 100644
index 81faeef84..000000000
--- a/web/i/mojwatermark-378.png
+++ /dev/null
Binary files differ
diff --git a/web/i/mojwatermark6.png b/web/i/mojwatermark6.png
deleted file mode 100644
index a470e4cbc..000000000
--- a/web/i/mojwatermark6.png
+++ /dev/null
Binary files differ