From e0bb0ac7b68226a087fa81137cbfbcaf355dff13 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Aug 2018 18:05:09 +0200 Subject: [PATCH 01/10] Use the proper product name --- app/views/layouts/_support_navigator_banner.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_support_navigator_banner.html.haml b/app/views/layouts/_support_navigator_banner.html.haml index 95f7955d1..1360d3ffc 100644 --- a/app/views/layouts/_support_navigator_banner.html.haml +++ b/app/views/layouts/_support_navigator_banner.html.haml @@ -5,7 +5,7 @@ = 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 est trop ancien pour utiliser demarches-simplifiees.fr : certaines parties du site ne fonctionneront pas correctement. %br/ %br/ Nous vous recommendons fortement de From 1a1fe4b283e9dcd0c3122b9f9c0e4e0dc02b7e43 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Aug 2018 18:19:16 +0200 Subject: [PATCH 02/10] Use >= in .babelrc --- .babelrc | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.babelrc b/.babelrc index 714f21eae..621030e3c 100644 --- a/.babelrc +++ b/.babelrc @@ -6,12 +6,12 @@ // See config/browser.rb "browsers": [ "> 1%", - "Chrome 40", - "IE 11", - "Edge 12", - "Firefox 45", - "Safari 8", - "iOS 8" + "Chrome >= 40", + "IE >= 11", + "Edge >= 12", + "Firefox >= 45", + "Safari >= 8", + "iOS >= 8" ], "uglify": true }, From c19f6a2416119ec15e30e04ce8fabd13dfd7cc12 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Aug 2018 18:21:03 +0200 Subject: [PATCH 03/10] Add Opera constraint to .babelrc --- .babelrc | 1 + 1 file changed, 1 insertion(+) diff --git a/.babelrc b/.babelrc index 621030e3c..b2e6c21b4 100644 --- a/.babelrc +++ b/.babelrc @@ -10,6 +10,7 @@ "IE >= 11", "Edge >= 12", "Firefox >= 45", + "Opera >= 19", "Safari >= 8", "iOS >= 8" ], From fad18d617324e814e54b4ded6654e647d83a6574 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Aug 2018 18:21:14 +0200 Subject: [PATCH 04/10] Update the minimum browsers versions --- .babelrc | 8 ++++---- config/initializers/browser.rb | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.babelrc b/.babelrc index b2e6c21b4..0787eddc4 100644 --- a/.babelrc +++ b/.babelrc @@ -6,11 +6,11 @@ // See config/browser.rb "browsers": [ "> 1%", - "Chrome >= 40", + "Chrome >= 50", "IE >= 11", - "Edge >= 12", - "Firefox >= 45", - "Opera >= 19", + "Edge >= 14", + "Firefox >= 50", + "Opera >= 40", "Safari >= 8", "iOS >= 8" ], diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb index eb506559f..c85b33555 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.chrome? && b.version.to_i >= 50 } 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.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 } From 3d14ae418fc35bd3e16e4451574bb91ab86f0a09 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Aug 2018 18:24:49 +0200 Subject: [PATCH 05/10] Unify the syntax in browser.rb --- config/initializers/browser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb index c85b33555..96690b656 100644 --- a/config/initializers/browser.rb +++ b/config/initializers/browser.rb @@ -1,7 +1,7 @@ # See .babelrc Browser.modern_rules.clear Browser.modern_rules << -> b { b.chrome? && b.version.to_i >= 50 } -Browser.modern_rules << -> b { b.ie?([">=11"]) } +Browser.modern_rules << -> b { b.ie? && b.version.to_i >= 11 && !b.compatibility_view? } Browser.modern_rules << -> b { b.edge? } Browser.modern_rules << -> b { b.firefox? && b.version.to_i >= 50 } Browser.modern_rules << -> b { b.opera? && b.version.to_i >= 40 } From 9c94308209b66bc997dd41eef990f210c85afcb7 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 21 Aug 2018 18:30:04 +0200 Subject: [PATCH 06/10] Enforce a minimum Edge version --- config/initializers/browser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/browser.rb b/config/initializers/browser.rb index 96690b656..9294e4cfe 100644 --- a/config/initializers/browser.rb +++ b/config/initializers/browser.rb @@ -2,7 +2,7 @@ Browser.modern_rules.clear 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? } +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 } From 0b7060d48b2b1cb4b18c3288d65d8bc9cbc027a6 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 22 Aug 2018 10:59:01 +0200 Subject: [PATCH 07/10] Improve the outdated browser message --- app/views/layouts/_support_navigator_banner.html.haml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/app/views/layouts/_support_navigator_banner.html.haml b/app/views/layouts/_support_navigator_banner.html.haml index 1360d3ffc..f2b1b4b89 100644 --- a/app/views/layouts/_support_navigator_banner.html.haml +++ b/app/views/layouts/_support_navigator_banner.html.haml @@ -2,10 +2,7 @@ - if !browser.modern? #support-navigator-banner.row .col-xs-12 - = browser.name - = browser.version - \- - Attention, votre navigateur est trop ancien pour utiliser demarches-simplifiees.fr : 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 From af56e735724068c33d324883489eabf6f398372e Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 22 Aug 2018 10:59:49 +0200 Subject: [PATCH 08/10] Open the browser-update.org link in a new tab --- app/views/layouts/_support_navigator_banner.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_support_navigator_banner.html.haml b/app/views/layouts/_support_navigator_banner.html.haml index f2b1b4b89..6a293d0c1 100644 --- a/app/views/layouts/_support_navigator_banner.html.haml +++ b/app/views/layouts/_support_navigator_banner.html.haml @@ -6,5 +6,5 @@ %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 \. From e6442436bafbbc05406da77aca470b71ee3a820f Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 22 Aug 2018 11:19:56 +0200 Subject: [PATCH 09/10] Remove a space before a final period --- app/views/layouts/_support_navigator_banner.html.haml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/_support_navigator_banner.html.haml b/app/views/layouts/_support_navigator_banner.html.haml index 6a293d0c1..fff24dcfd 100644 --- a/app/views/layouts/_support_navigator_banner.html.haml +++ b/app/views/layouts/_support_navigator_banner.html.haml @@ -7,4 +7,5 @@ %br/ Nous vous recommendons fortement de %a{ href: "https://browser-update.org/fr/update.html", target: "_blank" }mettre à jour votre navigateur - \. + %span<> + \. From 1fb3f516bfa8f2831fa02b4285b649ab3322c9b7 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Wed, 22 Aug 2018 11:22:57 +0200 Subject: [PATCH 10/10] Add a new color variable --- app/assets/stylesheets/new_design/_colors.scss | 1 + app/assets/stylesheets/new_design/support_navigator_banner.scss | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) 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; } }