diff options
| author | Matthew Somerville <matthew@mysociety.org> | 2016-06-17 11:47:02 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew@mysociety.org> | 2016-06-17 11:47:02 +0100 |
| commit | 1e52bd4bb74d4d9ece6bd42bea60886eb618b12a (patch) | |
| tree | a9c1585f01e0730d348128a28106a08c307a64af | |
| parent | d06f318eb439e0bf115557f24e906934acb5cafa (diff) | |
| parent | 2fd27d1e9d501b3716a5462368b839727d2fdbc7 (diff) | |
Merge branch 'drop-ie6-fix-ie7'
44 files changed, 35 insertions, 239 deletions
diff --git a/templates/web/angus/header.html b/templates/web/angus/header.html index c59e91079..dccbe70fb 100644 --- a/templates/web/angus/header.html +++ b/templates/web/angus/header.html @@ -4,7 +4,6 @@ # SET html_att = html_att _ ' dir="rtl"'; -%] <!doctype html> -<!--[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]--> diff --git a/templates/web/angus/maps/fms.html b/templates/web/angus/maps/fms.html index 810a55de0..ec4033041 100644 --- a/templates/web/angus/maps/fms.html +++ b/templates/web/angus/maps/fms.html @@ -6,9 +6,6 @@ <script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> <script src="[% version('/cobrands/angus/position_map.js') %]" charset="utf-8"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] [% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/header.html b/templates/web/base/header.html index 8e5cb3c73..edb921feb 100644 --- a/templates/web/base/header.html +++ b/templates/web/base/header.html @@ -4,7 +4,6 @@ # SET html_att = html_att _ ' dir="rtl"'; -%] <!doctype html> -<!--[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]--> diff --git a/templates/web/base/maps/bing.html b/templates/web/base/maps/bing.html index 1747f1bbe..7c1942d0d 100644 --- a/templates/web/base/maps/bing.html +++ b/templates/web/base/maps/bing.html @@ -4,9 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] [% map_html = INCLUDE maps/openlayers.html %] diff --git a/templates/web/base/maps/fms.html b/templates/web/base/maps/fms.html index 31e050ba1..ed5547227 100644 --- a/templates/web/base/maps/fms.html +++ b/templates/web/base/maps/fms.html @@ -5,9 +5,6 @@ <script type="text/javascript" src="[% version('/js/map-bing-ol.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-fms.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] [% map_html = INCLUDE maps/openlayers.html include_key = 1 %] diff --git a/templates/web/base/maps/google-ol.html b/templates/web/base/maps/google-ol.html index a87c87afb..543918692 100644 --- a/templates/web/base/maps/google-ol.html +++ b/templates/web/base/maps/google-ol.html @@ -4,9 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-google-ol.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> -<![endif]--> [% END %] [% map_sub_links = BLOCK %] diff --git a/templates/web/base/maps/mapquest-attribution.html b/templates/web/base/maps/mapquest-attribution.html index 804710ad1..58f872527 100644 --- a/templates/web/base/maps/mapquest-attribution.html +++ b/templates/web/base/maps/mapquest-attribution.html @@ -3,9 +3,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> -<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/osm-streetview.html b/templates/web/base/maps/osm-streetview.html index dff6a0c0f..7840884bd 100644 --- a/templates/web/base/maps/osm-streetview.html +++ b/templates/web/base/maps/osm-streetview.html @@ -3,9 +3,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-streetview.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/osm-toner-lite.html b/templates/web/base/maps/osm-toner-lite.html index 64fa91937..d6d395c22 100644 --- a/templates/web/base/maps/osm-toner-lite.html +++ b/templates/web/base/maps/osm-toner-lite.html @@ -4,9 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-toner-lite.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/base/maps/osm.html b/templates/web/base/maps/osm.html index 0b2db1a53..58f872527 100644 --- a/templates/web/base/maps/osm.html +++ b/templates/web/base/maps/osm.html @@ -3,9 +3,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-OpenStreetMap.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/js/OpenLayers-2.13.1/theme/default/ie6-style.css" type="text/css"> -<![endif]--> [% END %] [% map_html = BLOCK %] diff --git a/templates/web/fiksgatami/header.html b/templates/web/fiksgatami/header.html index 3e77e89ca..f22e97fef 100644 --- a/templates/web/fiksgatami/header.html +++ b/templates/web/fiksgatami/header.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[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]--> diff --git a/templates/web/harrogate/header.html b/templates/web/harrogate/header.html index 8612cb3f8..4c188f552 100644 --- a/templates/web/harrogate/header.html +++ b/templates/web/harrogate/header.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[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]--> diff --git a/templates/web/hart/header.html b/templates/web/hart/header.html index ed5d2fed4..23264066c 100644 --- a/templates/web/hart/header.html +++ b/templates/web/hart/header.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[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]--> diff --git a/templates/web/oxfordshire/header.html b/templates/web/oxfordshire/header.html index 6c4427414..0e4281df4 100644 --- a/templates/web/oxfordshire/header.html +++ b/templates/web/oxfordshire/header.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[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]--> diff --git a/templates/web/stevenage/header.html b/templates/web/stevenage/header.html index fb6f2ae5b..3b6761b5c 100644 --- a/templates/web/stevenage/header.html +++ b/templates/web/stevenage/header.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[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]--> diff --git a/templates/web/warwickshire/header.html b/templates/web/warwickshire/header.html index b76ecc2ae..cb6917234 100644 --- a/templates/web/warwickshire/header.html +++ b/templates/web/warwickshire/header.html @@ -1,5 +1,4 @@ <!DOCTYPE html><!-- 3P header begins --> -<!--[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]--> diff --git a/templates/web/zurich/header.html b/templates/web/zurich/header.html index b87dd913b..071e4fad8 100644 --- a/templates/web/zurich/header.html +++ b/templates/web/zurich/header.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[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]--> diff --git a/templates/web/zurich/maps/zurich.html b/templates/web/zurich/maps/zurich.html index 46b003530..e0c258223 100644 --- a/templates/web/zurich/maps/zurich.html +++ b/templates/web/zurich/maps/zurich.html @@ -4,9 +4,6 @@ <script type="text/javascript" src="[% version('/js/map-OpenLayers.js') %]"></script> <script type="text/javascript" src="[% version('/js/map-wmts-zurich.js') %]"></script> <script type="text/javascript" src="[% version('/js/jquery.ba-hashchange.min.js') %]"></script> -<!--[if lte IE 6]> - <link rel="stylesheet" href="/jslib/OpenLayers-2.10/theme/default/ie6-style.css" type="text/css" /> -<![endif]--> [% END %] [% map_sub_links = BLOCK %] diff --git a/web/cobrands/angus/base.scss b/web/cobrands/angus/base.scss index 50f207058..25cb08b2b 100644 --- a/web/cobrands/angus/base.scss +++ b/web/cobrands/angus/base.scss @@ -6,7 +6,6 @@ @import "../sass/base"; body.frontpage #site-logo, -.ie6 body.frontpage #site-logo, #site-logo { background: url("/cobrands/angus/third_party/css_img/angus-logo-header.png") 0 0 no-repeat; diff --git a/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss index 35d629400..1e4277700 100644 --- a/web/cobrands/angus/layout.scss +++ b/web/cobrands/angus/layout.scss @@ -5,11 +5,8 @@ $max_page_width: 1200px; #site-logo, -.ie6 #site-logo, body.frontpage #site-logo, -.ie6 body.frontpage #site-logo, -body.twothirdswidthpage #site-logo, -.ie6 body.twothirdswidthpage #site-logo +body.twothirdswidthpage #site-logo { position: relative; top: 13px; @@ -221,7 +218,7 @@ footer p.social a background-color:#3c3c3c; border-radius:1em; float:left; - font-size:2.25rem; + font-size: 2.8125em; // 0.8em from footer, so this then == 2.25rem height:1em; margin:0 .25em 0 0; text-indent:-20000px; @@ -232,31 +229,21 @@ footer p.social a footer p.social a:before { float:left; - font-size:1.25rem; + font-size: 1.5625em; // 0.8em from footer, so this == 1.25rem line-height:1.8; text-align:center; text-indent:0; width:100%; } -.lt-ie9 footer p.social a:before -{ - font-size:1.25em; -} - footer p.social a:active,footer p.social a:focus,footer p.social a:hover { background-color:#353535; text-decoration:none; } -.ie6, .ie7, .ie8 { - footer p.social a { - font-size:2.25em; - } -} - -.ie6, .ie7 { +// No :before support in IE7, reset things back +.ie7 { footer p.social a { font-size:1.2em!important; height:1.5em; diff --git a/web/cobrands/bromley/base.scss b/web/cobrands/bromley/base.scss index 9f7c0e9ae..5661632a3 100644 --- a/web/cobrands/bromley/base.scss +++ b/web/cobrands/bromley/base.scss @@ -17,10 +17,6 @@ position: absolute; z-index:2; } -// Override in IE too -.ie6 #site-logo { - background: url('/cobrands/bromley/bromley-logo.s.png') 0 0 no-repeat; -} // Change the colour and size of the site header to suit #site-header { @@ -344,8 +340,8 @@ input.field, input.text, border-bottom: none!important; } -// Fix the A-Z menu in IE 6/7 -.ie6, .ie7 { +// Fix the A-Z menu in IE7 +.ie7 { .main-a-z ul li { display:block; float:left; diff --git a/web/cobrands/bromley/layout.scss b/web/cobrands/bromley/layout.scss index 27bd45889..a8c1f35ce 100644 --- a/web/cobrands/bromley/layout.scss +++ b/web/cobrands/bromley/layout.scss @@ -40,9 +40,6 @@ body.mappage { } } } -.ie6 body.frontpage #site-logo { - background:url(/cobrands/bromley/bromley-logo.png) 0 0 no-repeat; -} // Override the container width to match Bromley' site, which is wider .container { diff --git a/web/cobrands/eastsussex/base.scss b/web/cobrands/eastsussex/base.scss index 4ed5cac42..d855e67a4 100644 --- a/web/cobrands/eastsussex/base.scss +++ b/web/cobrands/eastsussex/base.scss @@ -205,7 +205,7 @@ styling, but this doesn't dtrt with span, so adding ourselves */ font-size: 1.0em; } -.ie6, .ie7 { +.ie7 { body { z-index: 1; } diff --git a/web/cobrands/fixamingata/layout.scss b/web/cobrands/fixamingata/layout.scss index 442874360..db035e2c6 100644 --- a/web/cobrands/fixamingata/layout.scss +++ b/web/cobrands/fixamingata/layout.scss @@ -84,7 +84,7 @@ h3, h4, width: auto; } } -.ie6, .ie7 { +.ie7 { .tablewrapper { div { width: auto; @@ -103,7 +103,7 @@ h3, h4, } } } -.ie6, .ie7 { +.ie7 { #footer-help { ul { li { diff --git a/web/cobrands/fixmystreet.com/fmsforcouncils.scss b/web/cobrands/fixmystreet.com/fmsforcouncils.scss index eee507288..f620b8eea 100644 --- a/web/cobrands/fixmystreet.com/fmsforcouncils.scss +++ b/web/cobrands/fixmystreet.com/fmsforcouncils.scss @@ -519,7 +519,9 @@ $fms-green: #62b356; } } - .ie8, .ie7 { +/* Apply the desktop width media queries from above in + IE7/8 which do not handle media queries */ +.ie8, .ie7 { .fms-for-councils { .wrapper { display: table; @@ -601,5 +603,4 @@ $fms-green: #62b356; margin-left: 30px; } } - - } +} diff --git a/web/cobrands/fixmystreet/images/ie_fixed.gif b/web/cobrands/fixmystreet/images/ie_fixed.gif Binary files differdeleted file mode 100644 index 438bd6894..000000000 --- a/web/cobrands/fixmystreet/images/ie_fixed.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/ie_front_logo.gif b/web/cobrands/fixmystreet/images/ie_front_logo.gif Binary files differdeleted file mode 100644 index 71225283f..000000000 --- a/web/cobrands/fixmystreet/images/ie_front_logo.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif b/web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif Binary files differdeleted file mode 100644 index 0b2fd5741..000000000 --- a/web/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/ie_logo.gif b/web/cobrands/fixmystreet/images/ie_logo.gif Binary files differdeleted file mode 100644 index cfcbd258b..000000000 --- a/web/cobrands/fixmystreet/images/ie_logo.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/ie_mobileapps.gif b/web/cobrands/fixmystreet/images/ie_mobileapps.gif Binary files differdeleted file mode 100644 index 604efc101..000000000 --- a/web/cobrands/fixmystreet/images/ie_mobileapps.gif +++ /dev/null diff --git a/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif b/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif Binary files differdeleted file mode 100644 index e00fd955a..000000000 --- a/web/cobrands/fixmystreet/images/ie_mysoc_logo.gif +++ /dev/null diff --git a/web/cobrands/greenwich/base.scss b/web/cobrands/greenwich/base.scss index 517b16471..756b2d60a 100644 --- a/web/cobrands/greenwich/base.scss +++ b/web/cobrands/greenwich/base.scss @@ -6,7 +6,6 @@ @import "../sass/base"; body.frontpage #site-logo, -.ie6 body.frontpage #site-logo, #site-logo { background: url("/cobrands/greenwich/logo.gif") 0 0 no-repeat; diff --git a/web/cobrands/greenwich/layout.scss b/web/cobrands/greenwich/layout.scss index ad31941f6..54150cfd4 100644 --- a/web/cobrands/greenwich/layout.scss +++ b/web/cobrands/greenwich/layout.scss @@ -6,11 +6,8 @@ $fixed_page_width: 990px; #site-logo, -.ie6 #site-logo, body.frontpage #site-logo, -.ie6 body.frontpage #site-logo, -body.twothirdswidthpage #site-logo, -.ie6 body.twothirdswidthpage #site-logo +body.twothirdswidthpage #site-logo { position: relative; top: 14px; diff --git a/web/cobrands/harrogate/base.scss b/web/cobrands/harrogate/base.scss index 6c4a906f7..4c3278241 100644 --- a/web/cobrands/harrogate/base.scss +++ b/web/cobrands/harrogate/base.scss @@ -5,7 +5,6 @@ @import "../sass/base"; body.frontpage #site-logo, -.ie6 body.frontpage #site-logo, #site-logo { display: block; diff --git a/web/cobrands/harrogate/layout.scss b/web/cobrands/harrogate/layout.scss index 287fd85f4..197892c8f 100644 --- a/web/cobrands/harrogate/layout.scss +++ b/web/cobrands/harrogate/layout.scss @@ -5,7 +5,6 @@ $mappage-header-height: 10em; @import "../sass/layout"; #site-logo, -.ie6 #site-logo, body.frontpage #site-logo { position: relative; @@ -19,7 +18,6 @@ body.frontpage #site-logo #site-header, body.frontpage #site-header, -.ie6 body.frontpage #site-header, .ie7 body.frontpage #site-header, .nav-wrapper-2 { diff --git a/web/cobrands/hart/hart.scss b/web/cobrands/hart/hart.scss index 95607242c..737dab4e9 100644 --- a/web/cobrands/hart/hart.scss +++ b/web/cobrands/hart/hart.scss @@ -373,24 +373,10 @@ body.frontpage .table-cell .content { } // IE specific CSS -.ie6 { - div { zoom: 1; } - .hart-wrapper { padding: 0; } - #hart-footer { margin: 0; } - //#search input { padding: 8px 5px 2px; } - //#search input.button { padding: 0; width: 68px; line-height: 24px; } - input.button { overflow: visible; width: 1%; } -} .ie7 { div { zoom: 1; } - //#search input { padding: 8px 5px 2px; } - //#search input.button { padding: 0; width: 68px; line-height: 24px; } input.button { overflow: visible; } } -.ie8 { - //#search input { padding: 8px 5px 2px; } - //#search input.button { padding: 0; line-height: 24px; } -} // mySociety additions .hart-header { diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index ad3bb5e16..f81d969ab 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -335,13 +335,7 @@ label{ } } } -// IE6 doesn't extend the grey box back with the above negative margins, and -// the password box falls off screen for some reason. Just have boring margins, -// it looks okay. -.ie6 .form-box { - margin: 0 0 0.25em; - padding: 1em; -} + // Prevent grey displaying oddly by giving it a width, and stop odd left margin issue .ie7 .form-box { width: 100%; @@ -460,9 +454,6 @@ p.label-valid { position: absolute; z-index:2; } -.ie6 #site-logo { - background: url('/cobrands/fixmystreet/images/ie_logo.gif') 0 -5px no-repeat; -} // this is a skip to nav for mobile users only #nav-link { @@ -532,9 +523,6 @@ p.label-valid { background-repeat: no-repeat; text-indent: -999999px; } -.ie6 #mysoc-logo { - background: url('/cobrands/fixmystreet/images/ie_mysoc_logo.gif') center no-repeat; -} .ie7 #mysoc-logo { background: url($image-sprite) -240px -38px no-repeat; } @@ -621,7 +609,7 @@ body.mappage .wrapper { } //because display:table doesn't work we float -.ie6, .ie7 { +.ie7 { .shadow-wrap { ul#key-tools{ background:#f5f5f5; @@ -635,19 +623,6 @@ body.mappage .wrapper { } } } -.ie6 .shadow-wrap ul#key-tools li a { - &.abuse { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); - background-position: $right 0px; - } - &.feed { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); - background-position: $right -58px; - } - &:hover { - background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite_dark.gif'); - } -} .iel8 { .shadow-wrap ul#key-tools li a.chevron { background-image:url('/cobrands/fixmystreet/images/ie_key_tools_sprite.gif'); @@ -939,15 +914,6 @@ input.final-submit { border-bottom: none; } -.ie6 .item-list--reports__item { - a { - height: 5.5em; - } - .img { - height: 60px; - } -} - .problem-header .update-img, .item-list .update-img { float: $right; @@ -1069,10 +1035,6 @@ html.js #map .noscript { #{$left}: 0.5em; #{$right}: 0.5em; } -// The left and right of the above causes the navigation to move off-screen left in IE6. -.ie6 #fms_pan_zoom { - #{$left}: auto !important; -} // Openlayers map controls (overrides) #fms_pan_zoom_panup, @@ -1170,21 +1132,6 @@ html.js #map .noscript { } } -.ie6 #sub_map_links a { - &#hide_pins_link { - background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); - background-position: $right 1px; - } - &#all_pins_link { - background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); - background-position: $right -45px; - } - &#map_permalink { - background-image:url('/cobrands/fixmystreet/images/ie_sub_map_links_sprite.gif'); - background-position: $right -93px; - } -} - #mob_sub_map_links { position: absolute; bottom:0; diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index d7bef87fa..cd90b74ed 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -60,7 +60,7 @@ h1 { //pad the top of the wrapper to allow space for the menu to fit in //when its positioned absolute below -.ie6, .ie7 { +.ie7 { .wrapper { padding-top:4em; } @@ -79,7 +79,7 @@ h1 { } //position absolute the menu as ie doesn't like display:table -.ie6, .ie7 { +.ie7 { .nav-wrapper { position: absolute; top:0; @@ -103,7 +103,6 @@ h1 { position: static;//reset position so the nav links become clickable } - .ie6 &, .ie7 & { height: 3em; // Without this, the #site-logo is unclickable. @@ -192,14 +191,15 @@ h1 { width:84px; height:16px; background-size: 100px auto; - background-position: -8px 0px; + background-position: 50% 50%; opacity: 0.8; &:hover { opacity: 1; } -} -.ie8 #mysoc-logo { - width: 100px; + // IE8 does not support background-size, so increase width to show whole image + .ie8 & { + width: 100px; + } } .ie7 #mysoc-logo { background-position: -260px -43px; @@ -257,10 +257,10 @@ body.mappage { } #site-logo { - position: absolute; #{$left}: 12px; // Also inherits... // `top: 0.9em` + // `position: absolute` // `z-index: 3` // ...from the non-mappage version, above } @@ -307,7 +307,7 @@ body.mappage { } } -.ie6, .ie7 { +.ie7 { body.mappage { // The below is *mandatory* to allow pins/zoom to be clickable in IE6/7. Do NOT remove. .container { @@ -321,26 +321,6 @@ body.mappage { position:static; } } - #site-logo { - position: absolute; - } - } -} -//ie8 needs different stuff on .nav-wrapper so we -//have to define all the rest of it again as this resets -//the z-index base yet again :S -.ie8 { - body.mappage { - .nav-wrapper{ - position: relative; - z-index:0; - .nav-wrapper-2 { - position:static; - } - } - #site-logo { - position: absolute; - } } } @@ -538,15 +518,6 @@ body.twothirdswidthpage { } } } -//as ie6 doesn't like 'fixed' we will make it absolute again -.ie6 body.twothirdswidthpage .content .sticky-sidebar { - position:static; - aside { - position:absolute; - #{$left}: 42em; - top:0; - } -} // Centre the login and password change pages, // but keep them narrow to match the report sidebar @@ -578,10 +549,11 @@ body.authpage { } //fix table to be a block for ie, float the children -.ie6, .ie7 { +.ie7 { .tablewrapper { + *zoom: 1; display:block; - div {//ie6 doesn't support '>div', so we'll go with the somewhat risker 'div' + >div { width:48%; display:block; float: $left; @@ -612,7 +584,7 @@ body.authpage { border-bottom:none; } } -.ie6, .ie7 { +.ie7 { #footer-mobileapps { margin:0 0.5em; margin-#{$right}: 2%; @@ -632,7 +604,7 @@ body.authpage { } } } -.ie6, .ie7 { +.ie7 { #footer-help { margin-#{$left}: 2%; ul { @@ -772,11 +744,6 @@ body.authpage { } } -// The padding is for the fading out when it's fixed positioned, which it isn't in IE6. -.ie6 .shadow-wrap { - padding-top: 0; -} - // Old versions of IE don't have box-sixing, so negative margins leave a 2em gap. // We can set a fixed width instead, which might result in a horizontal scrollbar // while the drawer is opening. Quel dommage. @@ -843,13 +810,6 @@ body.authpage { } } } -.ie6 .banner p { - top:-1.5em; - &#fixed { - background-image:url(/cobrands/fixmystreet/images/ie_fixed.gif); - background-position:center 0.75em; - } -} /*FORMS*/ input[type=text], @@ -935,7 +895,7 @@ body.frontpage { } } } -.ie6, .ie7 { +.ie7 { body.frontpage { #site-header { height:4em; @@ -945,9 +905,6 @@ body.frontpage { } } } -.ie6 body.frontpage #site-logo { - background:url(/cobrands/fixmystreet/images/ie_front_logo.gif) 0 0 no-repeat; -} // big yellow bit full screen width #front-main { @@ -1038,7 +995,7 @@ body.frontpage { } } } -.ie6, .ie7 { +.ie7 { #front_stats { div { width:8em; @@ -1056,8 +1013,7 @@ body.frontpage { margin-top:0; } - -.ie6, .ie7 { +.ie7 { .tablewrapper { #front-howto { margin-#{$right}: 2%; @@ -1104,7 +1060,6 @@ body.frontpage { // Just the mySociety circle logo background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAABJ9JREFUeNqsVXlMHFUYf/Pe7O7M7E2Xw6UFWg5LQ1GTosa0IT00wYbGaKoltWnaRGNrjIptiUalXqlJU9RU0fSPHtqCR20pliBpQpAmxQgoLDeLQIEuh2WBndmDnZn3fMvRsqEGVv0mv3lzvPd97/u97wBgmXLUbHvOFZ/cJK1KbTtmiX4F/J+ySzBuDiakeSdWphA3RSAhTX3NaN2znLVwyQkMA/YbzAcwAAIFIBSYELjPYH6Zpf9CwrEMeGS1zhalh2zEBkIq2NCdkDvfyOxCRqHfnnpIWN9caK+5URDX2VJob8zfZsqJyIBKlVzweU7pIMIC3TFHIUAISkSx2GKE2uK8qNK0ODZbVsgKuwllnthp/S4rUZs0vx4th0dHcLp3FCv1VogEL8G9Jz2THx4Tx79+Yh23/oVs4zuBwKx3CuWQ5aHO5VYba7oDDjDj/TJEpSgWJytD0FAP5Dm6PD4ySZmSIUM0+C6DoGdUdkXkwULBC56HJtRJuxFpsu7nsll60CwHQY3D/8PRq1NFQZXg+TP8TwKphhc3GXPS4zWP9tySm07XSZe9MgkLEpCuX5uZZdqQBwEM1nsaStq87V3/xtjGTVzKB29bj0RZkK2s3PvTJ59PnWG2Rm3esTP2mW80gDUByq+CFffJoS+2tkrtTZEoz80R1pVfjrsBEGMGCvWAQ+DsV5MFcLstp0jFqsmH/cCn+qjLMGqLdcvrcOkIDpO9eYY9QMuYVRED1U8A8Sjg6Vz9AahH+mi84OhCzwISbAwT8fFoFr6EjlgvMAh2eDtP85AP7XwGHORAi9R6USVqRNrPlUqlIEgCSM8ApGMAtCBw/nvpLGqR2qoFxIMYbUwCJvh2tbv6oyt/lX8Z6fa7e+Thdsd0bdpa7QqvF49UlPmKXz0y/vEdHqyshaeDH2lNNoPGmhlUfQMuydmzHOX2VENMTKKQ0OMQu6Qxv8hqaLDMhWoY0VlxuXkPx24vZhhooa/elts1hddvfXsCE/yPyrftTdj15ME1n3J6FOsTlbFrZwbeqDrVdz4sD0Ji41fan019q1MF2Ego/wy9NIjDl5zHM1xeZ8e9lMenGuIPl2zoIIAxqjIGiO4cIeg/vrs+fbBDvBlWi3RISKF5YCQYz5XkGRchx+rT6djBpzyYaM3Zl0ftaqd++fGSt7m2NTqBT9dwyOgXldmaRWnRcgyflGnKWGTAr0hOTFQPjSQTHWciihCCJd9IM/fAxuTV712shTreHppreXz3of739+dMDFW1E0wUBjIsHQGt4gDT8BtsF52L+oE74BquH7l6kFIzoYE6agBJv49V5o/JI39G5750mNFydlWaAiHQOca45/Pfvdk17bp2ur+AM6CAYGKBlkdyQ+Xom4OdYve83rBy3Tj284U+T/N1njUmBVTf0Lh/qBdABDQ2+31Elu8mkaoAyAsxgHbIK5/1FnX9NlmVmGFa0/vHVL+zYaJloc5F/cAdGB4AIIT51FaBWFdRps94bIciB2ZaJ+T1wNf2azmYS8bOOndbCPcKhGX1g0BfqwPpzUS3Ki0ZanVeT13FuZHiQ4UkOK0stfZvAQYA/wr53nPx8cUAAAAASUVORK5CYII=); background-size: auto; - background-position: 50% 50%; } //Revert to mobile use of the .full-width class diff --git a/web/cobrands/stevenage/_council_header.scss b/web/cobrands/stevenage/_council_header.scss index 64ef45feb..fdbdf3d03 100644 --- a/web/cobrands/stevenage/_council_header.scss +++ b/web/cobrands/stevenage/_council_header.scss @@ -731,8 +731,3 @@ } } -.ie8{ - #stv-header #stv-pageTools #stv-searchStatic{ - width: 50%; - } -} diff --git a/web/cobrands/stevenage/layout.scss b/web/cobrands/stevenage/layout.scss index 63de06652..ceac33d16 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -23,7 +23,7 @@ // because IE7 doesn't support the table-caption styles. // This means, we need to make sure page content doesn't // disappear behind the header. -.ie6, .ie7 { +.ie7 { .content { margin-top: 10em; } @@ -153,13 +153,6 @@ body.mappage { // content sidebar down beyond .nav-wrapper-2 height: 3em; display: block; - - // For reasons beyond my comprehension, the 3em - // height results in a 3em gap in IE8. I assume - // some bug with table-cell / table-caption? - .ie8 & { - height: 0; - } } // Over-specific selector required to trump _layout.scss diff --git a/web/cobrands/zurich/layout.scss b/web/cobrands/zurich/layout.scss index 7bb44c231..79c374c67 100644 --- a/web/cobrands/zurich/layout.scss +++ b/web/cobrands/zurich/layout.scss @@ -231,11 +231,6 @@ body.twothirdswidthpage { } } } -.ie6 .banner p { - &#fixed { - background-image: none; - } -} #fms_pan_zoom { top: 2em; diff --git a/web/down.default.html b/web/down.default.html index d3403d76c..760004cc1 100644 --- a/web/down.default.html +++ b/web/down.default.html @@ -1,5 +1,4 @@ <!doctype html> -<!--[if lt IE 7]><html class="no-js ie6 iel8" lang="en-gb"><![endif]--> <!--[if IE 7]> <html class="no-js ie7 iel8" lang="en-gb"><![endif]--> <!--[if IE 8]> <html class="no-js ie8 iel8" lang="en-gb"><![endif]--> <!--[if IE 9]> <html class="no-js ie9" lang="en-gb"><![endif]--> diff --git a/web/js/OpenLayers-2.13.1/theme/default/ie6-style.css b/web/js/OpenLayers-2.13.1/theme/default/ie6-style.css deleted file mode 100644 index a0fd7c639..000000000 --- a/web/js/OpenLayers-2.13.1/theme/default/ie6-style.css +++ /dev/null @@ -1,10 +0,0 @@ -.olControlZoomPanel div { - background-image: url(img/zoom-panel-NOALPHA.png); -} -.olControlPanPanel div { - background-image: url(img/pan-panel-NOALPHA.png); -} -.olControlEditingToolbar { - width: 200px; -} - diff --git a/web/js/OpenLayers-2.13.1/theme/default/ie6-style.tidy.css b/web/js/OpenLayers-2.13.1/theme/default/ie6-style.tidy.css deleted file mode 100644 index 7a23bbc78..000000000 --- a/web/js/OpenLayers-2.13.1/theme/default/ie6-style.tidy.css +++ /dev/null @@ -1 +0,0 @@ -.olControlZoomPanel div{background-image:url(img/zoom-panel-NOALPHA.png);}.olControlPanPanel div{background-image:url(img/pan-panel-NOALPHA.png);}.olControlEditingToolbar{width:200px;}
\ No newline at end of file |
