diff --git a/.babelrc b/.babelrc index 714f21eae..0787eddc4 100644 --- a/.babelrc +++ b/.babelrc @@ -6,12 +6,13 @@ // See config/browser.rb "browsers": [ "> 1%", - "Chrome 40", - "IE 11", - "Edge 12", - "Firefox 45", - "Safari 8", - "iOS 8" + "Chrome >= 50", + "IE >= 11", + "Edge >= 14", + "Firefox >= 50", + "Opera >= 40", + "Safari >= 8", + "iOS >= 8" ], "uglify": true }, diff --git a/app/assets/stylesheets/new_design/_colors.scss b/app/assets/stylesheets/new_design/_colors.scss index 086abb191..b07ace308 100644 --- a/app/assets/stylesheets/new_design/_colors.scss +++ b/app/assets/stylesheets/new_design/_colors.scss @@ -1,5 +1,6 @@ $blue: #0069CC; $light-blue: #1C7EC9; +$lighter-blue: #C3D9FF; $black: #333333; $grey: #999999; $light-grey: #F8F8F8; diff --git a/app/assets/stylesheets/new_design/support_navigator_banner.scss b/app/assets/stylesheets/new_design/support_navigator_banner.scss index 956c82ec4..36189f7d1 100644 --- a/app/assets/stylesheets/new_design/support_navigator_banner.scss +++ b/app/assets/stylesheets/new_design/support_navigator_banner.scss @@ -14,7 +14,7 @@ z-index: 1000; a { - color: #C3D9FF; + color: $lighter-blue; text-decoration: underline; } } diff --git a/app/views/layouts/_support_navigator_banner.html.haml b/app/views/layouts/_support_navigator_banner.html.haml index 95f7955d1..fff24dcfd 100644 --- a/app/views/layouts/_support_navigator_banner.html.haml +++ b/app/views/layouts/_support_navigator_banner.html.haml @@ -2,12 +2,10 @@ - if !browser.modern? #support-navigator-banner.row .col-xs-12 - = browser.name - = browser.version - \- - Attention, votre navigateur est trop ancien pour utiliser Démarches Simplifiées : certaines parties du site ne fonctionneront pas correctement. + Attention, votre navigateur (#{browser.name} #{browser.version}) est trop ancien pour utiliser demarches-simplifiees.fr : certaines parties du site ne fonctionneront pas correctement. %br/ %br/ Nous vous recommendons fortement de - %a{ href: "https://browser-update.org/fr/update.html" }mettre à jour votre navigateur - \. + %a{ href: "https://browser-update.org/fr/update.html", target: "_blank" }mettre à jour votre navigateur + %span<> + \. diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb index eb506559f..9294e4cfe 100644 --- a/config/initializers/browser.rb +++ b/config/initializers/browser.rb @@ -1,8 +1,8 @@ # See .babelrc Browser.modern_rules.clear -Browser.modern_rules << -> b { b.chrome? && b.version.to_i >= 40 } -Browser.modern_rules << -> b { b.ie?([">=11"]) } -Browser.modern_rules << -> b { b.edge? } -Browser.modern_rules << -> b { b.firefox? && b.version.to_i >= 45 } -Browser.modern_rules << -> b { b.opera? && b.version.to_i >= 19 } +Browser.modern_rules << -> b { b.chrome? && b.version.to_i >= 50 } +Browser.modern_rules << -> b { b.ie? && b.version.to_i >= 11 && !b.compatibility_view? } +Browser.modern_rules << -> b { b.edge? && b.version.to_i >= 14 && !b.compatibility_view? } +Browser.modern_rules << -> b { b.firefox? && b.version.to_i >= 50 } +Browser.modern_rules << -> b { b.opera? && b.version.to_i >= 40 } Browser.modern_rules << -> b { b.safari? && b.version.to_i >= 8 }