aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew-github@dracos.co.uk>2018-04-30 13:49:09 +0100
committerMatthew Somerville <matthew-github@dracos.co.uk>2018-05-02 14:28:21 +0100
commit4204675024cd7d336280c43e3aa986d70bddd06a (patch)
tree4051bca2aaf28e96368c1922e6f1e1ec1501c8ad
parenteb0dff66c47f91f345ecbda223d67c32569148af (diff)
Drop IE7 support.
-rw-r--r--CHANGELOG.md1
-rw-r--r--templates/web/angus/header.html3
-rw-r--r--templates/web/base/common_header_tags.html2
-rw-r--r--templates/web/base/header.html3
-rw-r--r--templates/web/fiksgatami/header.html3
-rw-r--r--templates/web/hart/header.html3
-rw-r--r--templates/web/oxfordshire/header.html3
-rw-r--r--templates/web/stevenage/header.html3
-rw-r--r--templates/web/warwickshire/header.html3
-rw-r--r--templates/web/zurich/header.html3
-rw-r--r--web/cobrands/angus/layout.scss10
-rw-r--r--web/cobrands/bromley/base.scss8
-rw-r--r--web/cobrands/bromley/layout.scss4
-rw-r--r--web/cobrands/fixamingata/layout.scss16
-rw-r--r--web/cobrands/fixmystreet/fixmystreet.js2
-rw-r--r--web/cobrands/fixmystreet/header.js4
-rw-r--r--web/cobrands/hart/hart.scss6
-rw-r--r--web/cobrands/sass/_base.scss38
-rw-r--r--web/cobrands/sass/_layout.scss67
-rw-r--r--web/cobrands/stevenage/_council_header_responsive.scss7
-rw-r--r--web/cobrands/stevenage/layout.scss40
21 files changed, 20 insertions, 209 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31129d394..31d048732 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -54,6 +54,7 @@
- Add some Cypress browser-based testing.
- Upgrade Vagrantfile to use Ubuntu Xenial. #2093
- Add validation to cobrand-specific custom reporting fields.
+ - Drop support for IE7. #2114
* v2.3.1 (12th February 2018)
- Front end improvements:
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html
index 1814045cb..4b3d043a4 100644
--- a/templates/web/angus/header.html
+++ b/templates/web/angus/header.html
@@ -4,8 +4,7 @@
# SET html_att = html_att _ ' dir="rtl"';
-%]
<!doctype html>
-<!--[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 8]> <html class="no-js ie8"[% 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>
diff --git a/templates/web/base/common_header_tags.html b/templates/web/base/common_header_tags.html
index 153272cf7..69b155a9e 100644
--- a/templates/web/base/common_header_tags.html
+++ b/templates/web/base/common_header_tags.html
@@ -14,7 +14,7 @@
<script nonce="[% csp_nonce %]">
window.Modernizr=function(e,t,n){function r(e){p.cssText=e}function o(e,t){return typeof e===t}var a,i,c,l="2.8.3",s={},u=t.documentElement,d="modernizr",f=t.createElement(d),p=f.style,m=({}.toString,{}),h=[],y=h.slice,v=function(e,n,r,o){var a,i,c,l,s=t.createElement("div"),f=t.body,p=f||t.createElement("body");if(parseInt(r,10))for(;r--;)c=t.createElement("div"),c.id=o?o[r]:d+(r+1),s.appendChild(c);return a=["&#173;",'<style id="s',d,'">',e,"</style>"].join(""),s.id=d,(f?s:p).innerHTML+=a,p.appendChild(s),f||(p.style.background="",p.style.overflow="hidden",l=u.style.overflow,u.style.overflow="hidden",u.appendChild(p)),i=n(s,e),f?s.parentNode.removeChild(s):(p.parentNode.removeChild(p),u.style.overflow=l),!!i},g=function(t){var n=e.matchMedia||e.msMatchMedia;if(n)return n(t)&&n(t).matches||!1;var r;return v("@media "+t+" { #"+d+" { position: absolute; } }",function(t){r="absolute"==(e.getComputedStyle?getComputedStyle(t,null):t.currentStyle).position}),r},b={}.hasOwnProperty;c=o(b,"undefined")||o(b.call,"undefined")?function(e,t){return t in e&&o(e.constructor.prototype[t],"undefined")}:function(e,t){return b.call(e,t)};for(var E in m)c(m,E)&&(i=E.toLowerCase(),s[i]=m[E](),h.push((s[i]?"":"no-")+i));return r(""),f=a=null,s._version=l,s.mq=g,s.testStyles=v,s}(this,this.document);
var fixmystreet=fixmystreet||{};
- (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("iel8");c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");"IntersectionObserver"in window&&(a.className+=" lazyload");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" map-fullscreen only-map map-reporting"))})(document);
+ (function(b){var a=b.documentElement;a.className=a.className.replace(/\bno-js\b/,"js");var c=-1<a.className.indexOf("ie8");c=Modernizr.mq("(min-width: 48em)")||c?"desktop":"mobile";b=b.getElementById("js-meta-data");"IntersectionObserver"in window&&(a.className+=" lazyload");fixmystreet.page=b.getAttribute("data-page");fixmystreet.cobrand=b.getAttribute("data-cobrand");"mobile"==c&&(a.className+=" mobile","around"==fixmystreet.page&&(a.className+=" map-fullscreen only-map map-reporting"))})(document);
</script>
diff --git a/templates/web/base/header.html b/templates/web/base/header.html
index 3cc166a32..7f423ff9e 100644
--- a/templates/web/base/header.html
+++ b/templates/web/base/header.html
@@ -4,8 +4,7 @@
# SET html_att = html_att _ ' dir="rtl"';
-%]
<!doctype html>
-<!--[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 8]> <html class="no-js ie8"[% html_att %]><![endif]-->
<!--[if IE 9]> <html class="no-js ie9"[% html_att %]><![endif]-->
<!--[if gt IE 9]><!--><html class="no-js"[% html_att %]
[% IF appcache ~%]
diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html
index 7c73f6060..2d0f163e7 100644
--- a/templates/web/fiksgatami/header.html
+++ b/templates/web/fiksgatami/header.html
@@ -1,6 +1,5 @@
<!doctype html>
-<!--[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 8]> <html class="no-js 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/hart/header.html b/templates/web/hart/header.html
index 0aae5568b..a375fdb7d 100644
--- a/templates/web/hart/header.html
+++ b/templates/web/hart/header.html
@@ -1,6 +1,5 @@
<!doctype html>
-<!--[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 8]> <html class="no-js 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/oxfordshire/header.html b/templates/web/oxfordshire/header.html
index 0d3476195..c4824094a 100644
--- a/templates/web/oxfordshire/header.html
+++ b/templates/web/oxfordshire/header.html
@@ -1,6 +1,5 @@
<!doctype html>
-<!--[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 8]> <html class="no-js 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 %]"
[% IF appcache ~%]
diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html
index 219486a9e..0fe6dfed1 100644
--- a/templates/web/stevenage/header.html
+++ b/templates/web/stevenage/header.html
@@ -1,6 +1,5 @@
<!doctype html>
-<!--[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 8]> <html class="no-js 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/warwickshire/header.html b/templates/web/warwickshire/header.html
index 6ad06f69a..5470d401a 100644
--- a/templates/web/warwickshire/header.html
+++ b/templates/web/warwickshire/header.html
@@ -1,6 +1,5 @@
<!DOCTYPE html><!-- 3P header begins -->
-<!--[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 8]> <html class="no-js 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]-->
diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html
index 117e44449..b453465f7 100644
--- a/templates/web/zurich/header.html
+++ b/templates/web/zurich/header.html
@@ -1,6 +1,5 @@
<!doctype html>
-<!--[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 8]> <html class="no-js 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/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss
index 9429913b4..988f72df9 100644
--- a/web/cobrands/angus/layout.scss
+++ b/web/cobrands/angus/layout.scss
@@ -210,16 +210,6 @@ footer p.social a:active,footer p.social a:focus,footer p.social a:hover
text-decoration:none;
}
-// No :before support in IE7, reset things back
-.ie7 {
- footer p.social a {
- font-size:1.2em!important;
- height:1.5em;
- text-indent:0;
- width:auto;
- }
-}
-
.angus_nav {
display: block;
border-bottom: 1px solid $angus_grey_link;
diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss
index 768a3ec67..720dc1099 100644
--- a/web/cobrands/bromley/base.scss
+++ b/web/cobrands/bromley/base.scss
@@ -323,14 +323,6 @@ input.field, input.text,
border-bottom: none!important;
}
-// Fix the A-Z menu in IE7
-.ie7 {
- .main-a-z ul li {
- display:block;
- float:left;
- }
-}
-
// Bromley's breadcrumb
.breadcrumb {
width: 100%;
diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss
index d308daa4b..95c1228aa 100644
--- a/web/cobrands/bromley/layout.scss
+++ b/web/cobrands/bromley/layout.scss
@@ -20,7 +20,7 @@ body.mappage {
}
// We have to specify this again for IE, since FMS overrides it
-.iel8 {
+.ie8 {
body.fullwidthpage,
body.twothirdswidthpage {
#site-logo {
@@ -179,7 +179,7 @@ body.fullwidthpage .container .content footer .tablewrapper {
}
// Fix the footer in Old IE because it doesn't like last-child selectors
-.iel8 {
+.ie8 {
.site-footer {
.column {
// Old IE won't float the social media links unless we force the width to be
diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss
index bae9cd89b..e02093b24 100644
--- a/web/cobrands/fixamingata/layout.scss
+++ b/web/cobrands/fixamingata/layout.scss
@@ -104,13 +104,6 @@ body.mappage {
width: auto;
}
}
-.ie7 {
- .tablewrapper {
- div {
- width: auto;
- }
- }
-}
#footer-help {
ul {
@@ -123,15 +116,6 @@ body.mappage {
}
}
}
-.ie7 {
- #footer-help {
- ul {
- li {
- width: 33%;
- }
- }
- }
-}
#postcodeForm { margin-left: -1em !important; margin-right: -1em !important; }
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index b40e5ca01..0f63674b9 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -523,7 +523,7 @@ $.extend(fixmystreet.set_up, {
on_resize: function() {
var last_type;
$(window).on('resize', function() {
- var type = Modernizr.mq('(min-width: 48em)') || $('html.iel8').length ? 'desktop' : 'mobile';
+ var type = Modernizr.mq('(min-width: 48em)') || $('html.ie8').length ? 'desktop' : 'mobile';
if (last_type == type) { return; }
if (type == 'mobile') {
fixmystreet.resize_to.mobile_page();
diff --git a/web/cobrands/fixmystreet/header.js b/web/cobrands/fixmystreet/header.js
index 103922b08..170073ce3 100644
--- a/web/cobrands/fixmystreet/header.js
+++ b/web/cobrands/fixmystreet/header.js
@@ -5,8 +5,8 @@ var fixmystreet = fixmystreet || {};
(function(D){
var E = D.documentElement;
E.className = E.className.replace(/\bno-js\b/, 'js');
- var iel8 = E.className.indexOf('iel8') > -1;
- var type = Modernizr.mq('(min-width: 48em)') || iel8 ? 'desktop' : 'mobile';
+ var ie8 = E.className.indexOf('ie8') > -1;
+ var type = Modernizr.mq('(min-width: 48em)') || ie8 ? 'desktop' : 'mobile';
var meta = D.getElementById('js-meta-data');
if ('IntersectionObserver' in window) {
E.className += ' lazyload';
diff --git a/web/cobrands/hart/hart.scss b/web/cobrands/hart/hart.scss
index af2b79a50..d8f8599de 100644
--- a/web/cobrands/hart/hart.scss
+++ b/web/cobrands/hart/hart.scss
@@ -211,12 +211,6 @@ body.frontpage .table-cell .content {
}
}
-// IE specific CSS
-.ie7 {
- div { zoom: 1; }
- input.button { overflow: visible; }
-}
-
// mySociety additions
.hart-header {
font-size: 12px;
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss
index bd5020cfc..04562dffb 100644
--- a/web/cobrands/sass/_base.scss
+++ b/web/cobrands/sass/_base.scss
@@ -243,10 +243,6 @@ textarea {
padding: 0.5em;
font-size: 1em;
line-height: 1em;
-
- .ie7 & {
- max-width: 95%;
- }
}
textarea {
@@ -384,14 +380,6 @@ select.form-control {
margin-top: 1.25em;
}
-// Prevent grey displaying oddly by giving it a width, and stop odd left margin issue
-.ie7 .form-box {
- width: 100%;
- > input[type=text], input[type=email] {
- margin-#{$left}: 2em;
- }
-}
-
.change_location {
color: #666;
padding-#{$left}: 20px;
@@ -653,22 +641,6 @@ ul.error {
}
}
-//because display:table doesn't work we float
-.ie7 {
- #key-tools {
- background: #f5f5f5;
-
- li {
- float: $left;
- }
-
- a {
- padding-#{$left}: 1.5em;
- padding-#{$right}: 3em;
- }
- }
-}
-
#report-updates-data img {
float: $right;
}
@@ -1382,16 +1354,8 @@ input.final-submit {
#map {
width: 100%;
height: 100%;
-
- // IE7 doesn't understand 100% height when the parent height is "auto",
- // so we have to explicitly tell it to pin the element to the top and
- // bottom of the parent. No need for an ie7-specific condition, because
- // this makes no difference in other browsers.
- // We keep the "height: 100%" in there to give IE7 context for the 100%
- // height on #map's child, div.olMapViewport.
+ // Needs to be position:absolute for the mobile banners to show on top
position: absolute;
- top: 0;
- bottom: 0;
}
}
diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss
index b70e646e3..1955c6660 100644
--- a/web/cobrands/sass/_layout.scss
+++ b/web/cobrands/sass/_layout.scss
@@ -322,7 +322,7 @@ body.mappage.admin {
// They will no longer stretch the full height of the sidebar, and the
// width of #side-report will no longer match the width of .shadow-wrap
// when a scrollbar is present.
- .iel8 &,
+ .ie8 &,
.ie9 & {
@include clearfix();
@@ -420,7 +420,7 @@ body.fullwidthpage {
}
}
-.iel8 {
+.ie8 {
body.twothirdswidthpage,
body.fullwidthpage {
.container .content footer a.platform-logo {
@@ -509,20 +509,6 @@ body.authpage {
}
}
-//fix table to be a block for ie, float the children
-.ie7 {
- .tablewrapper {
- *zoom: 1;
- display:block;
- >div {
- width:48%;
- display:block;
- float: $left;
- border:none !important;
- }
- }
-}
-
// adds border to the top and goes full width
.bordered {
margin:0 -1em;
@@ -549,12 +535,6 @@ body.authpage {
border-bottom:none;
}
}
-.ie7 {
- #footer-mobileapps {
- margin:0 0.5em;
- margin-#{$right}: 2%;
- }
-}
#footer-help {
border-#{$left}: 1em solid transparent;
@@ -569,18 +549,6 @@ body.authpage {
}
}
}
-.ie7 {
- #footer-help {
- margin-#{$left}: 2%;
- ul {
- width:100%;
- li {
- float: $left;
- width: 45%;
- }
- }
- }
-}
// Openlayers map controls (overrides)
#fms_pan_zoom_panup,
@@ -787,7 +755,7 @@ body.authpage {
padding-top: 0.5em;
}
}
-.iel8 {
+.ie8 {
.big-green-banner {
background-image: url(/cobrands/fixmystreet/images/chevron-white-#{$right}-on-green.gif);
}
@@ -962,16 +930,6 @@ textarea.form-error {
border-right: none;
}
}
-.ie7 #front-main {
- #postcodeForm {
- div {
- input#pc {
- height:1.5em;
- width:16em;
- }
- }
- }
-}
#front-howto {
border-#{$right}: 1em solid transparent;
@@ -994,14 +952,6 @@ textarea.form-error {
}
}
}
-.ie7 {
- #front_stats {
- div {
- width:8em;
- float: $left;
- }
- }
-}
#front-recently {
border-#{$left}: 1em solid transparent;
@@ -1012,17 +962,6 @@ textarea.form-error {
margin-top:0;
}
-.ie7 {
- .tablewrapper {
- #front-howto {
- margin-#{$right}: 2%;
- }
- #front-recently {
- margin-#{$left}: 2%;
- }
- }
-}
-
.alerts__columns {
@include clearfix;
@include flex-container();
diff --git a/web/cobrands/stevenage/_council_header_responsive.scss b/web/cobrands/stevenage/_council_header_responsive.scss
index e65f097d9..b0d1a774d 100644
--- a/web/cobrands/stevenage/_council_header_responsive.scss
+++ b/web/cobrands/stevenage/_council_header_responsive.scss
@@ -53,13 +53,6 @@
float: none;
height: auto;
- // IE7 doesn't support table-cell
- .ie7 & {
- display: inline;
- float: left;
- width: 16.65%;
- }
-
a {
width: auto;
padding: 6px 12px;
diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss
index 93ab23268..5d5be12bf 100644
--- a/web/cobrands/stevenage/layout.scss
+++ b/web/cobrands/stevenage/layout.scss
@@ -23,7 +23,7 @@
background-color: #6b6969;
@include linear-gradient(#6b6969, #555454);
- .iel8 & {
+ .ie8 & {
background-color: #6b6969;
}
}
@@ -34,26 +34,6 @@
float: none;
}
-// We use absolute positioning for the header on IE7,
-// because IE7 doesn't support the table-caption styles.
-// This means, we need to make sure page content doesn't
-// disappear behind the header.
-.ie7 {
- .content {
- margin-top: 10em;
- }
-
- .frontpage {
- #front-main {
- margin-top: 15em;
- }
-
- .content {
- margin-top: 0;
- }
- }
-}
-
.nav-menu {
float: none;
}
@@ -156,22 +136,4 @@ body.mappage {
a.report-a-problem-btn {
color: #fff;
}
-
- // _layout.scss adds 4em of padding to leave space for
- // an absolutely positioned menu, but I can't tell what
- // that means. Stevenage, at least, doesn't need it.
- .wrapper {
- .ie7 & {
- padding-top: 0;
- }
- }
-
- // Not sure why IE7 has the old style of "inset" or "floating"
- // sidebar on the map page, but this makes it stop!
- .container {
- .ie7 & {
- margin-left: 0;
- }
- }
-
}