diff --git a/.sass-lint.yml b/.sass-lint.yml index 5ca87a97e4a6de05689e607f041f148a6973fc0e..3124c6d1cc9091b1e34f2ba59610e3483409e0d2 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -15,7 +15,6 @@ rules: - 2 - exclude: - 'media-query' - - 'target-ie11' # Line Spacing one-declaration-per-line: 2 diff --git a/hypha/static_src/src/app/src/components/DetailView/style.scss b/hypha/static_src/src/app/src/components/DetailView/style.scss index 8ef5f56405c459ec09a38d11a18317cb17ed3c31..a53cce066f04fb4ef616bc39589baf38ba13e6fb 100644 --- a/hypha/static_src/src/app/src/components/DetailView/style.scss +++ b/hypha/static_src/src/app/src/components/DetailView/style.scss @@ -16,8 +16,4 @@ @include media-query(desktop) { grid-template-columns: 390px 1fr; } - - @include target-ie11 { - display: flex; - } } diff --git a/hypha/static_src/src/app/src/components/Listing/style.scss b/hypha/static_src/src/app/src/components/Listing/style.scss index f6e4bbedd665ad5725f09883ccf468f5c0e73074..76ade81c48f2feb274f8d2edb628157ac0447d50 100644 --- a/hypha/static_src/src/app/src/components/Listing/style.scss +++ b/hypha/static_src/src/app/src/components/Listing/style.scss @@ -3,11 +3,6 @@ flex-grow: 3; transition: opacity $transition; - @include target-ie11 { - max-width: 390px; - width: 100%; - } - &.is-blank { padding: 20px; text-align: center; @@ -57,10 +52,6 @@ } &.is-active { - @include target-edge { - margin-left: 8px; - } - border-right: 2px solid $color--white; transition: border $transition; } diff --git a/hypha/static_src/src/app/src/containers/DisplayPanel/style.scss b/hypha/static_src/src/app/src/containers/DisplayPanel/style.scss index fac47646315349d9d511cbfe3ddddffcff72589b..eb8dca795b1e56587903d8e8c4cccdea5a54cb19 100644 --- a/hypha/static_src/src/app/src/containers/DisplayPanel/style.scss +++ b/hypha/static_src/src/app/src/containers/DisplayPanel/style.scss @@ -7,12 +7,6 @@ grid-template-rows: 75px 1fr; } - @include target-ie11 { - display: flex; - flex-wrap: wrap; - width: 100%; - } - &__column { border-bottom: 2px solid $color--light-mid-grey; } @@ -62,18 +56,4 @@ &__link { padding: 20px; } - - &__column { - &:first-child { - @include target-ie11 { - width: 70%; - } - } - - &:last-child { - @include target-ie11 { - width: 30%; - } - } - } } diff --git a/hypha/static_src/src/javascript/main-top.js b/hypha/static_src/src/javascript/main-top.js index eea775eb08e7cfaaaccac25a321f987057e96b72..15c8148234f410b63c43a64c189a0f2f850ccc5b 100644 --- a/hypha/static_src/src/javascript/main-top.js +++ b/hypha/static_src/src/javascript/main-top.js @@ -1,10 +1,7 @@ -(function ($) { +(function () { 'use strict'; - // IE 11 does not support classList.replace. - // document.querySelector('html').classList.replace('no-js', 'js'); - $('html').removeClass('no-js').addClass('js'); + document.querySelector('html').classList.replace('no-js', 'js'); - -})(jQuery); +})(); diff --git a/hypha/static_src/src/sass/apply/abstracts/_mixins.scss b/hypha/static_src/src/sass/apply/abstracts/_mixins.scss index d8069921a066642723a2af2e30148271525553a7..eeaf1dfa1cdba13af8ce3c1726edd146621cd798 100644 --- a/hypha/static_src/src/sass/apply/abstracts/_mixins.scss +++ b/hypha/static_src/src/sass/apply/abstracts/_mixins.scss @@ -171,20 +171,6 @@ border-right: 2px solid $color--light-mid-grey; } -// ie11-specific css -@mixin target-ie11 { - @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { - @content; - } -} - -// ms-edge specific css -@mixin target-edge { - @supports (-ms-ime-align: auto) { - @content; - } -} - @mixin table-ordering-styles { thead { th { diff --git a/hypha/static_src/src/sass/apply/components/_grid.scss b/hypha/static_src/src/sass/apply/components/_grid.scss index 06903cce6e6f322b29558cf3a5dc51d6b25d2606..db5479bffca6d4306ecddc82264be032b0503471 100644 --- a/hypha/static_src/src/sass/apply/components/_grid.scss +++ b/hypha/static_src/src/sass/apply/components/_grid.scss @@ -15,14 +15,6 @@ } } - &--two { - > * { - // fix for IE11 not rendering calc flex-basis correctly - flex-basis: auto; - width: calc(50% - 20px); - } - } - &--narrow { text-align: center; diff --git a/hypha/static_src/src/sass/public/components/_grid.scss b/hypha/static_src/src/sass/public/components/_grid.scss index 061952f998f6d5bec3c5bfa9a9ae10e001107b6a..b1ca252ea069892dacf5aa12d10d52a3a5f756b7 100644 --- a/hypha/static_src/src/sass/public/components/_grid.scss +++ b/hypha/static_src/src/sass/public/components/_grid.scss @@ -15,14 +15,6 @@ } } - &--two { - > * { - // fix for IE11 not rendering calc flex-basis correctly - flex-basis: auto; - width: calc(50% - 20px); - } - } - &--narrow { text-align: center; diff --git a/package.json b/package.json index 1ca3580c402ed2bab05713a4410d225e8c648a1e..040d743f35e6b26cd991599c1087f39d67d24cc2 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "license": "GPL-2.0", "browserslist": [ "> 3%", - "ie 11", "Firefox ESR", "last 2 versions" ],