aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-09-11 12:24:25 +0100
committerMatthew Somerville <matthew@mysociety.org>2015-09-17 11:13:34 +0100
commite1be6b75f154754172c7636f07866f7b428829d2 (patch)
tree1bd66735e20dee888565df68055806fad92a408c
parent87d849d7db3c35b5e540dee1f0ae22e27cc308e9 (diff)
Add 'iel8' class to handle IE6-8 things.
Remove unused 'oldie' (that was IE6-9).
Diffstat
-rw-r--r--templates/web/barnet/header.html8
-rw-r--r--templates/web/base/header.html6
-rw-r--r--templates/web/emptyhomes/header.html6
-rw-r--r--templates/web/fiksgatami/header.html8
-rw-r--r--templates/web/fixmybarangay/header.html8
-rw-r--r--templates/web/fixmystreet/header.html13
-rw-r--r--templates/web/harrogate/header.html8
-rw-r--r--templates/web/hart/header.html8
-rw-r--r--templates/web/oxfordshire/header.html8
-rw-r--r--templates/web/stevenage/header.html8
-rw-r--r--templates/web/warwickshire/header.html8
-rw-r--r--templates/web/zurich/header.html8
-rw-r--r--web/cobrands/barnet/layout.scss2
-rw-r--r--web/cobrands/bromley/layout.scss4
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js2
-rw-r--r--web/cobrands/oxfordshire/layout.scss2
-rw-r--r--web/cobrands/sass/_layout.scss12
-rw-r--r--web/cobrands/stevenage/layout.scss2
-rw-r--r--web/cobrands/zurich/layout.scss4
-rw-r--r--web/down.default.html6
20 files changed, 65 insertions, 66 deletions
diff --git a/templates/web/barnet/header.html b/templates/web/barnet/header.html
index 101d444a7..bb89483cb 100644
--- a/templates/web/barnet/header.html
+++ b/templates/web/barnet/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index e6362a449..479a349f3 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -1,7 +1,7 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 8]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/emptyhomes/header.html b/templates/web/emptyhomes/header.html
index de1ecec7b..0f6d1b3b8 100644
--- a/templates/web/emptyhomes/header.html
+++ b/templates/web/emptyhomes/header.html
@@ -1,7 +1,7 @@
<!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 lt IE 7]><html class="ie6" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="ie7" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="ie8" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 8]><!--><html lang="[% lang_code %]"><!--<![endif]-->
<head>
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index 3cdc093cb..ac607be8a 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/fixmybarangay/header.html b/templates/web/fixmybarangay/header.html
index 18388649b..739f4c761 100644
--- a/templates/web/fixmybarangay/header.html
+++ b/templates/web/fixmybarangay/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/fixmystreet/header.html b/templates/web/fixmystreet/header.html
index 4fde56e94..8368d345a 100644
--- a/templates/web/fixmystreet/header.html
+++ b/templates/web/fixmystreet/header.html
@@ -1,9 +1,12 @@
+[%
+ SET html_att = ' lang="' _ lang_code _ '"';
+-%]
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8"[% html_att %]><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8"[% html_att %]><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8"[% html_att %]><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]-->
+<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html
index e40a38d94..bd319e250 100644
--- a/templates/web/harrogate/header.html
+++ b/templates/web/harrogate/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html
index c2d363010..b7b4fefcc 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index bc52a0720..b4244a51b 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 155b35b64..87fb0d90d 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html
index 274a78ce7..e7b3d53a1 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -1,8 +1,8 @@
<!DOCTYPE html><!-- 3P header begins -->
-<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7 ie6 oldie" lang="[% lang_code %]"> <![endif]-->
-<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8 oldie" ie7 lang="[% lang_code %]"> <![endif]-->
-<!--[if IE 8]> <html class="no-js lt-ie9 ie8 oldie" lang="[% lang_code %]"> <![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]> <html class="no-js iel8 lt-ie9 lt-ie8 lt-ie7 ie6" lang="[% lang_code %]"> <![endif]-->
+<!--[if IE 7]> <html class="no-js iel8 lt-ie9 lt-ie8" ie7 lang="[% lang_code %]"> <![endif]-->
+<!--[if IE 8]> <html class="no-js iel8 lt-ie9 ie8" lang="[% lang_code %]"> <![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--> <html class="no-js" lang="[% lang_code %]"> <!--<![endif]-->
<head>
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index ae1b47712..0d06d2c53 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -1,8 +1,8 @@
<!doctype html>
-<!--[if lt IE 7]><html class="no-js ie6 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 7]> <html class="no-js ie7 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 8]> <html class="no-js ie8 oldie" lang="[% lang_code %]"><![endif]-->
-<!--[if IE 9]> <html class="no-js ie9 oldie" lang="[% lang_code %]"><![endif]-->
+<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 7]> <html class="no-js ie7 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 8]> <html class="no-js ie8 iel8" lang="[% lang_code %]"><![endif]-->
+<!--[if IE 9]> <html class="no-js ie9" lang="[% lang_code %]"><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js" lang="[% lang_code %]"><!--<![endif]-->
<head>
<meta name="viewport" content="initial-scale=1.0">
diff --git a/web/cobrands/barnet/layout.scss b/web/cobrands/barnet/layout.scss
index a80a1958e..d9f7bf4e6 100644
--- a/web/cobrands/barnet/layout.scss
+++ b/web/cobrands/barnet/layout.scss
@@ -97,7 +97,7 @@ body.twothirdswidthpage {
.frontpage .content {
margin: 0;
}
-.ie6, .ie7, .ie8 {
+.iel8 {
.frontpage .content {
border: none;
}
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index c845fe75c..55d9a7f40 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -29,7 +29,7 @@ body.mappage {
}
// We have to specify this again for IE, since FMS overrides it
-.ie6, .ie7, .ie8 {
+.iel8 {
body.fullwidthpage,
body.twothirdswidthpage {
#site-header {
@@ -228,7 +228,7 @@ body.frontpage #site-logo {
}
// Fix the footer in Old IE because it doesn't like last-child selectors
-.ie6, .ie7, .ie8 {
+.iel8 {
.site-footer {
.column {
// Old IE won't float the social media links unless we force the width to be
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index 9bd8c5fd5..fc09ea84a 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -58,7 +58,7 @@ $(function(){
// Deal with switching between mobile and desktop versions on resize
var last_type;
$(window).resize(function(){
- var type = Modernizr.mq('(min-width: 48em)') || $('html.ie6, html.ie7, html.ie8').length ? 'desktop' : 'mobile';
+ var type = Modernizr.mq('(min-width: 48em)') || $('html.iel8').length ? 'desktop' : 'mobile';
if (last_type == type) { return; }
if (type == 'mobile') {
$html.addClass('mobile');
diff --git a/web/cobrands/oxfordshire/layout.scss b/web/cobrands/oxfordshire/layout.scss
index 195c5342f..75a31e461 100644
--- a/web/cobrands/oxfordshire/layout.scss
+++ b/web/cobrands/oxfordshire/layout.scss
@@ -39,7 +39,7 @@ body, body a {
margin: 0;
@include box-shadow(none);
}
-.ie6, .ie7, .ie8 {
+.iel8 {
.content {
margin: 0;
border: none;
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index d7a2a3fc1..c04d9f1c1 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -221,7 +221,7 @@ h1 {
color: #222;
@include box-shadow(0 0 10px rgba(0,0,0,0.5));
}
-.ie6, .ie7, .ie8 {
+.iel8 {
.content {
// If no box-shadow, just want a boring black border to stand it out from the map.
border: 1px solid #666;
@@ -433,17 +433,13 @@ body.fullwidthpage {
}
}
-.ie6, .ie7, .ie8 {
+.iel8 {
body.twothirdswidthpage,
body.fullwidthpage {
.content {
border: 0px;
}
- }
-}
-.ie6, .ie7, .ie8 {
- body.twothirdswidthpage,
- body.fullwidthpage {
+
.container .content footer a.platform-logo {
color: #ffffff;
background: none;
@@ -943,7 +939,7 @@ body.frontpage {
}
}
//logo fix
-.ie6, .ie7, .ie8 {
+.iel8 {
body.frontpage {
#site-logo {
position:relative;
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index b6f154298..eb62cf7c4 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -72,7 +72,7 @@
// 452ce6a0 - "Added IE6/7 position change to front page header too" -
// turned off border for ie6-8 .content - why, as box-shadow still on?
-.ie6, .ie7, .ie8 {
+.iel8 {
.content {
border: none;
}
diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss
index 39bbb20b4..f25870a48 100644
--- a/web/cobrands/zurich/layout.scss
+++ b/web/cobrands/zurich/layout.scss
@@ -9,7 +9,7 @@
color: #3c3c3c;
@include box-shadow(none);
}
-.ie6, .ie7, .ie8 {
+.iel8 {
.content {
border: none;
}
@@ -18,7 +18,7 @@
body.mappage .content, body.frontpage .content {
@include box-shadow(0 0 6px 1px #000);
}
-.ie6, .ie7, .ie8 {
+.iel8 {
body.mappage .content, body.frontpage .content {
border: 1px solid #666;
}
diff --git a/web/down.default.html b/web/down.default.html
index c109ece36..f86ca504f 100644
--- a/web/down.default.html
+++ b/web/down.default.html
@@ -1,7 +1,7 @@
<!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 lt IE 7]><html class="ie6 iel8" lang="en-gb"><![endif]-->
+<!--[if IE 7]> <html class="ie7 iel8" lang="en-gb"><![endif]-->
+<!--[if IE 8]> <html class="ie8 iel8" lang="en-gb"><![endif]-->
<!--[if gt IE 8]><!--><html lang="en-gb"><!--<![endif]-->
<head>
<title>FixMyStreet</title>
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-26 16:41:49 +0000