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

stylesheet: move all browser banner styles into site-banner.scss

Browse source
This commit is contained in:
Pierre de La Morinerie 2019-12-04 14:03:39 +00:00
parent 87e4c62c21
commit 704ac64f63
4 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/stylesheets/application.scss
View file

@ -28,7 +28,7 @@
// = require print // = require print
// = require procedure // = require procedure
// = require search // = require search
// = require outdated_browser_banner // = require site_banner
// = require switch_menu // = require switch_menu
// = require autocomplete // = require autocomplete
// = require users // = require users

12
app/assets/stylesheets/new_design/outdated_browser_banner.scss → app/assets/stylesheets/new_design/site_banner.scss
View file

@ -1,21 +1,27 @@
@import "colors"; @import "colors";
@import "constants"; @import "constants";
#outdated-browser-banner { .site-banner {
width: 100%; width: 100%;
margin: 0; margin: 0;
padding: $default-padding; padding: $default-padding;
color: $black; color: $black;
background-color: $yellow; background-color: $yellow;
border-bottom: 1px dashed rgba(0, 0, 0, 0.6);
.container {
display: flex;
align-items: center;
}
} }
.outdated-browser-icon { .site-banner-icon {
margin-right: $default-padding; margin-right: $default-padding;
font-size: 30px; font-size: 30px;
opacity: 0.7; opacity: 0.7;
} }
.outdated-browser-buttons { .site-banner-actions {
display: flex; display: flex;
margin-left: auto; margin-left: auto;

7
app/assets/stylesheets/outdated_browser_banner.scss → app/assets/stylesheets/site_banner.scss
View file

@ -1,9 +1,10 @@
#outdated-browser-banner { .site-banner {
width: 100%; width: 100%;
margin: 0; margin: 0;
color: #333333; color: #333333;
background-color: #FEF3B8; background-color: #FEF3B8;
border-bottom: 1px dashed rgba(0, 0, 0, 0.6);
.container { .container {
display: flex; display: flex;
@ -13,13 +14,13 @@
} }
} }
.outdated-browser-icon { .site-banner-icon {
margin-right: 16px; margin-right: 16px;
font-size: 30px; font-size: 30px;
opacity: 0.7; opacity: 0.7;
} }
.outdated-browser-buttons { .site-banner-actions {
display: flex; display: flex;
margin-left: auto; margin-left: auto;
} }

11
app/views/layouts/_outdated_browser_banner.html.haml
View file

@ -1,15 +1,14 @@
-# See config/browser.rb -# See config/browser.rb
- if !browser.modern? && !has_dismissed_outdated_browser_banner? - if !browser.modern? && !has_dismissed_outdated_browser_banner?
#outdated-browser-banner #outdated-browser-banner.site-banner
.container.flex.align-center .container
.outdated-browser-icon .site-banner-icon ⚠️
⚠️ .site-banner-text
.outdated-browser-test
%strong %strong
#{browser.name} #{browser.version} est trop ancien pour utiliser demarches-simplifiees.fr. #{browser.name} #{browser.version} est trop ancien pour utiliser demarches-simplifiees.fr.
%br %br
Certaines parties du site ne fonctionneront pas correctement. Certaines parties du site ne fonctionneront pas correctement.
.outdated-browser-buttons .site-banner-actions
= button_to 'Ignorer', dismiss_outdated_browser_path, method: :post, remote: true, class: 'button btn', title: 'Ne plus afficher cet avertissement pendant une semaine' = button_to 'Ignorer', dismiss_outdated_browser_path, method: :post, remote: true, class: 'button btn', title: 'Ne plus afficher cet avertissement pendant une semaine'
%a.btn.button.primary{ href: "https://browser-update.org/fr/update.html", target: "_blank", rel: "noopener" } %a.btn.button.primary{ href: "https://browser-update.org/fr/update.html", target: "_blank", rel: "noopener" }
Mettre à jour mon navigateur Mettre à jour mon navigateur