DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2437 from betagouv/improve-2342

Browse source 
Improve #2342
This commit is contained in:
Paul Chavard 2018-08-22 12:11:44 +00:00 • committed by GitHub
commit 9ea36717ec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
.babelrc
View file

@ -6,12 +6,13 @@
// See config/browser.rb // See config/browser.rb
"browsers": [ "browsers": [
"> 1%", "> 1%",
"Chrome 40", "Chrome >= 50",
"IE 11", "IE >= 11",
"Edge 12", "Edge >= 14",
"Firefox 45", "Firefox >= 50",
"Safari 8", "Opera >= 40",
"iOS 8" "Safari >= 8",
"iOS >= 8"
], ],
"uglify": true "uglify": true
}, },

1
app/assets/stylesheets/new_design/_colors.scss
View file

@ -1,5 +1,6 @@
$blue: #0069CC; $blue: #0069CC;
$light-blue: #1C7EC9; $light-blue: #1C7EC9;
$lighter-blue: #C3D9FF;
$black: #333333; $black: #333333;
$grey: #999999; $grey: #999999;
$light-grey: #F8F8F8; $light-grey: #F8F8F8;

2
app/assets/stylesheets/new_design/support_navigator_banner.scss
View file

@ -14,7 +14,7 @@
z-index: 1000; z-index: 1000;
a { a {
color: #C3D9FF; color: $lighter-blue;
text-decoration: underline; text-decoration: underline;
} }
} }

10
app/views/layouts/_support_navigator_banner.html.haml
View file

@ -2,12 +2,10 @@
- if !browser.modern? - if !browser.modern?
#support-navigator-banner.row #support-navigator-banner.row
.col-xs-12 .col-xs-12
= browser.name Attention, votre navigateur (#{browser.name} #{browser.version}) est trop ancien pour utiliser demarches-simplifiees.fr : certaines parties du site ne fonctionneront pas correctement.
= browser.version
\-
Attention, votre navigateur est trop ancien pour utiliser Démarches Simplifiées : certaines parties du site ne fonctionneront pas correctement.
%br/ %br/
%br/ %br/
Nous vous recommendons fortement de 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<>
\.

10
config/initializers/browser.rb
View file

@ -1,8 +1,8 @@
# See .babelrc # See .babelrc
Browser.modern_rules.clear 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.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 >= 45 } Browser.modern_rules << -> b { b.firefox? && b.version.to_i >= 50 }
Browser.modern_rules << -> b { b.opera? && b.version.to_i >= 19 } Browser.modern_rules << -> b { b.opera? && b.version.to_i >= 40 }
Browser.modern_rules << -> b { b.safari? && b.version.to_i >= 8 } Browser.modern_rules << -> b { b.safari? && b.version.to_i >= 8 }