diff --git a/app/assets/javascripts/iehack.js b/app/assets/javascripts/iehack.js deleted file mode 100644 index ff211c6107..0000000000 --- a/app/assets/javascripts/iehack.js +++ /dev/null @@ -1,5 +0,0 @@ -$( document ).ready(function() { - $("#closeie").click(function() { - $("#ie-warning").hide(); - }); -}) diff --git a/app/views/layouts/darkswarm.html.haml b/app/views/layouts/darkswarm.html.haml index 2c6ceac20f..472f37b74f 100644 --- a/app/views/layouts/darkswarm.html.haml +++ b/app/views/layouts/darkswarm.html.haml @@ -36,10 +36,6 @@ = action_cable_meta_tag %body{ class: body_classes, "body-scroll": "true", "data-turbo": "false" } - / [if lte IE 8] - = render partial: "shared/ie_warning" - = javascript_include_tag "iehack" - .off-canvas-wrap{ offcanvas: true } .fixed.off-canvas-fixed = render "shared/menu/menu" unless @hide_menu diff --git a/app/views/layouts/registration.html.haml b/app/views/layouts/registration.html.haml index 48c6366cee..30e6297fca 100644 --- a/app/views/layouts/registration.html.haml +++ b/app/views/layouts/registration.html.haml @@ -19,10 +19,6 @@ = csrf_meta_tags %body.off-canvas{ style: "background-image: url(#{image_pack_path('tile-wide.png')})", "data-turbo": "false" } - / [if lte IE 8] - = render partial: "shared/ie_warning" - = javascript_include_tag "iehack" - .off-canvas-wrap{offcanvas: true} .inner-wrap diff --git a/app/views/shared/_ie_warning.html.haml b/app/views/shared/_ie_warning.html.haml deleted file mode 100644 index 2a71f966bc..0000000000 --- a/app/views/shared/_ie_warning.html.haml +++ /dev/null @@ -1,31 +0,0 @@ -.alert-box.alert#ie-warning{"data-alert" => ""} - .row.ie-msg - .small-4.large-2.columns - %i.ofn-i_012-warning - .small-8.large-10.columns - %h3 - = t :ie_warning_headline - %p - = t :ie_warning_text - .row - .small-4.columns.browserbtn - %a.browserlogo{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} - %img{src: image_pack_path("browser-logos/chrome.png") } - %a{href: "https://www.google.com/intl/en_au/chrome/browser/", target: "_blank"} - = t :ie_warning_chrome - .small-4.columns.browserbtn - %a.browserlogo{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} - %img{src: image_pack_path("browser-logos/firefox.png") } - %a{href: "http://www.mozilla.org/en-US/firefox/new/", target: "_blank"} - = t :ie_warning_firefox - .small-4.columns.browserbtn - %a.browserlogo{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} - %img{src: image_pack_path("browser-logos/internet-explorer.png") } - %a{href: "http://windows.microsoft.com/en-AU/internet-explorer/download-ie", target: "_blank"} - = t :ie_warning_ie - .row.ie-msg - .small-12.large-12.columns - .text-center - %em - = t :ie_warning_other - %a#closeie.close{href: "#"} × diff --git a/app/webpacker/css/darkswarm/all.scss b/app/webpacker/css/darkswarm/all.scss index d57b326c58..61d9b86d53 100644 --- a/app/webpacker/css/darkswarm/all.scss +++ b/app/webpacker/css/darkswarm/all.scss @@ -39,7 +39,6 @@ @import 'home_tagline'; @import 'hub_node'; @import 'hubs'; -@import 'ie_warning'; @import 'images'; @import 'lists'; @import 'loading'; diff --git a/app/webpacker/css/darkswarm/ie_warning.scss b/app/webpacker/css/darkswarm/ie_warning.scss deleted file mode 100644 index 0ed3940734..0000000000 --- a/app/webpacker/css/darkswarm/ie_warning.scss +++ /dev/null @@ -1,40 +0,0 @@ -#ie-warning { - margin-bottom: 0; - padding-bottom: 2rem; - - .ie-msg { - background: rgba(255, 255, 255, 0.15); - padding: 0.5rem; - margin-bottom: 1rem; - margin-top: 1rem; - } - - .browserbtn { - text-align: center; - margin-bottom: 1rem; - - a { - color: white; - font-size: 1rem; - filter: alpha(opacity = 70); - opacity: 0.7; - - &:hover, &:active, &:focus { - filter: alpha(opacity = 100); - opacity: 1; - } - } - - a.browserlogo { - display: block; - width: 100%; - } - } - - i { - font-size: 5rem; - color: white; - text-align: center; - display: block; - } -} diff --git a/app/webpacker/images/browser-logos/chrome.png b/app/webpacker/images/browser-logos/chrome.png deleted file mode 100644 index a55fcfec96..0000000000 Binary files a/app/webpacker/images/browser-logos/chrome.png and /dev/null differ diff --git a/app/webpacker/images/browser-logos/firefox.png b/app/webpacker/images/browser-logos/firefox.png deleted file mode 100644 index 91c1f85a95..0000000000 Binary files a/app/webpacker/images/browser-logos/firefox.png and /dev/null differ diff --git a/app/webpacker/images/browser-logos/internet-explorer.png b/app/webpacker/images/browser-logos/internet-explorer.png deleted file mode 100644 index af4739dd89..0000000000 Binary files a/app/webpacker/images/browser-logos/internet-explorer.png and /dev/null differ diff --git a/config/application.rb b/config/application.rb index 9e6b47d006..a428c54de6 100644 --- a/config/application.rb +++ b/config/application.rb @@ -213,7 +213,6 @@ module Openfoodnetwork # Instead, they must be explicitly included below # http://stackoverflow.com/questions/8012434/what-is-the-purpose-of-config-assets-precompile config.assets.initialize_on_precompile = true - config.assets.precompile += ['iehack.js'] config.assets.precompile += ['admin/*.js', 'admin/**/*.js'] config.assets.precompile += ['web/all.js'] config.assets.precompile += ['darkswarm/all.js'] diff --git a/config/locales/en.yml b/config/locales/en.yml index 1e1f4537ff..d52c7935e9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1815,12 +1815,6 @@ en: card_could_not_be_removed: Sorry, the card could not be removed invalid_credit_card: "Invalid credit card" - ie_warning_headline: "Your browser is out of date :-(" - ie_warning_text: "For the best Open Food Network experience, we strongly recommend upgrading your browser:" - ie_warning_chrome: Download Chrome - ie_warning_firefox: Download Firefox - ie_warning_ie: Upgrade Internet Explorer - ie_warning_other: "Can't upgrade your browser? Try Open Food Network on your smartphone :-)" legal: cookies_policy: header: "How We Use Cookies"