aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--templates/web/default/header.html10
-rw-r--r--templates/web/emptyhomes/header.html13
-rw-r--r--web/cobrands/emptyhomes/css.css6
-rw-r--r--web/css/_main.scss14
-rw-r--r--web/css/ie6.css17
-rw-r--r--web/down.default.html10
6 files changed, 36 insertions, 34 deletions
diff --git a/templates/web/default/header.html b/templates/web/default/header.html
index cfe4911a0..c39aa11a8 100644
--- a/templates/web/default/header.html
+++ b/templates/web/default/header.html
@@ -1,12 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="[% lang_code %]">
+<!doctype html>
+<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
<head>
<link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
<link rel="stylesheet" type="text/css" href="[% version('/css/main.css') %]">
- <!--[if LT IE 7]>
- <link rel="stylesheet" type="text/css" href="/css/ie6.css">
- <![endif]-->
[% INCLUDE 'common_header_tags.html' %]
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index 25d62db5c..d1198eada 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -1,14 +1,13 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="[% lang_code %]">
+<!doctype html>
+<!--[if lt IE 7]><html class="ie6 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="ie7 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
<head>
<link rel="stylesheet" type="text/css" href="[% version('/css/core.css') %]">
<link rel="stylesheet" type="text/css" href="/cobrands/emptyhomes/css.css">
- <!--[if LT IE 7]>
- <link rel="stylesheet" type="text/css" href="/css/ie6.css">
- <![endif]-->
-
-[% INCLUDE 'common_header_tags.html' %]
+ [% INCLUDE 'common_header_tags.html' %]
</head>
<body>
diff --git a/web/cobrands/emptyhomes/css.css b/web/cobrands/emptyhomes/css.css
index 168eae2de..e59497880 100644
--- a/web/cobrands/emptyhomes/css.css
+++ b/web/cobrands/emptyhomes/css.css
@@ -174,10 +174,16 @@ a:hover, a:active {
padding: 20px;
overflow: auto;
}
+
+.ie6 #emptyhomes-footer {
+ zoom: 1;
+}
+
#emptyhomes-footer div {
float: left;
margin-right: 2em;
}
+
#emptyhomes-footer a {
color: #FFFFFF;
}
diff --git a/web/css/_main.scss b/web/css/_main.scss
index b4e4a13f0..84994c62a 100644
--- a/web/css/_main.scss
+++ b/web/css/_main.scss
@@ -158,6 +158,20 @@ select, input, textarea {
right: 10px;
}
+.ie6 #logo {
+ display: none;
+}
+
+.ie6 #logoie {
+ width: 133px;
+ height: 26px;
+ filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/i/mysociety-dark.png',sizingMethod='scale');
+ position: absolute;
+ top: 4em;
+ right: 10px;
+ cursor: pointer;
+}
+
#footer {
clear: both;
text-align: center;
diff --git a/web/css/ie6.css b/web/css/ie6.css
deleted file mode 100644
index fd3e26047..000000000
--- a/web/css/ie6.css
+++ /dev/null
@@ -1,17 +0,0 @@
-#logo {
- display: none;
-}
-
-#logoie {
- width: 133px;
- height: 26px;
- filter:progid:DXImageTransform.Microsoft.AlphaImageLoader(src='/i/mysociety-dark.png',sizingMethod='scale');
- position: absolute;
- top: 4em;
- right: 10px;
- cursor: pointer;
-}
-
-#emptyhomes-footer {
- zoom: 1;
-}
diff --git a/web/down.default.html b/web/down.default.html
index 10502d89b..c109ece36 100644
--- a/web/down.default.html
+++ b/web/down.default.html
@@ -1,12 +1,12 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en-gb">
+<!doctype html>
+<!--[if lt IE 7]><html class="ie6 oldie" lang="en-gb"><![endif]-->
+<!--[if IE 7]> <html class="ie7 oldie" lang="en-gb"><![endif]-->
+<!--[if IE 8]> <html class="ie8 oldie" lang="en-gb"><![endif]-->
+<!--[if gt IE 8]><!--><html lang="en-gb"><!--<![endif]-->
<head>
<title>FixMyStreet</title>
<link rel="stylesheet" type="text/css" href="/css/core.css">
<link rel="stylesheet" type="text/css" href="/css/main.css">
-<!--[if LT IE 7]>
- <link rel="stylesheet" type="text/css" href="/css/ie6.css">
-<![endif]-->
</head>
<body>