diff options
author | Matthew Somerville <matthew@mysociety.org> | 2016-06-15 17:55:55 +0100 |
---|---|---|
committer | Matthew Somerville <matthew@mysociety.org> | 2016-06-15 17:57:25 +0100 |
commit | 69814bfa05cdd12d053d580dd4ded5ca2e50b325 (patch) | |
tree | 6af406e87eb3db9b944bb85d08f64861a90e918e | |
parent | a6d72e5057e161273e0b7ead7da990fc5b8500e1 (diff) |
Remove most IE8 special cases.
Document the couple that are left, and fix the display of the logo
with a simpler positioning/ less overriding. Drop a needless usage
of 'rem' to make things a bit easier there too.
-rw-r--r-- | web/cobrands/angus/layout.scss | 15 | ||||
-rw-r--r-- | web/cobrands/fixmystreet.com/fmsforcouncils.scss | 7 | ||||
-rw-r--r-- | web/cobrands/hart/hart.scss | 6 | ||||
-rw-r--r-- | web/cobrands/sass/_layout.scss | 32 | ||||
-rw-r--r-- | web/cobrands/stevenage/_council_header.scss | 5 | ||||
-rw-r--r-- | web/cobrands/stevenage/layout.scss | 7 |
6 files changed, 12 insertions, 60 deletions
diff --git a/web/cobrands/angus/layout.scss b/web/cobrands/angus/layout.scss index 4fb9bd0d1..1e4277700 100644 --- a/web/cobrands/angus/layout.scss +++ b/web/cobrands/angus/layout.scss @@ -218,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; @@ -229,30 +229,19 @@ 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; } -.ie7, .ie8 { - footer p.social a { - font-size:2.25em; - } -} - // No :before support in IE7, reset things back .ie7 { footer p.social a { 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/hart/hart.scss b/web/cobrands/hart/hart.scss index 00b23cdfb..737dab4e9 100644 --- a/web/cobrands/hart/hart.scss +++ b/web/cobrands/hart/hart.scss @@ -375,14 +375,8 @@ body.frontpage .table-cell .content { // IE specific CSS .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/_layout.scss b/web/cobrands/sass/_layout.scss index a3bb9fd43..33020b5a1 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -191,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; @@ -256,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 } @@ -320,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; - } } } @@ -1078,7 +1059,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 16d29f9e2..ceac33d16 100644 --- a/web/cobrands/stevenage/layout.scss +++ b/web/cobrands/stevenage/layout.scss @@ -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 |