From 522d39bf9e40b7e6fe3efb308631c2491ba9a694 Mon Sep 17 00:00:00 2001 From: chankalan Date: Mon, 8 Feb 2021 21:39:38 +0100 Subject: [PATCH] =?UTF-8?q?typo=20+=20g=C3=A9n=C3=A9rique=20pour=20surchar?= =?UTF-8?q?ge=20et=20champ=20recherche=20(fix=20styles=20chromium)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- squelettes/scss/base/_typo.scss | 11 ++++------- squelettes/scss/styles/_nav.scss | 2 +- squelettes/scss/styles/_styles.scss | 3 +++ squelettes/scss/utils/_mixins.scss | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/squelettes/scss/base/_typo.scss b/squelettes/scss/base/_typo.scss index ed78f4c..fe6b349 100644 --- a/squelettes/scss/base/_typo.scss +++ b/squelettes/scss/base/_typo.scss @@ -1,6 +1,4 @@ - - - +/* Font Awesome */ .fas { font-family:Fontawesome-s; color:$couleurPrincipale; @@ -10,12 +8,11 @@ color:$couleurPrincipale; } - - +/* autres */ $typo-Merriweather: 'Merriweather', serif; $typo-texte: $typo-Merriweather; -$typo-titres: $typo-Merriweather; +$typo-titre: $typo-Merriweather; body { $_computed_bfs: strip-unit($body-font-size) / strip-unit($_base-font-size); @@ -73,7 +70,7 @@ h3, .h3, h4, .h4, h5, .h5, h6, .h6 { - font-family: $typo-titres; + font-family: $typo-titre; font-weight: 200; line-height: 1.2; font-style: normal; diff --git a/squelettes/scss/styles/_nav.scss b/squelettes/scss/styles/_nav.scss index 702c49d..c79f988 100644 --- a/squelettes/scss/styles/_nav.scss +++ b/squelettes/scss/styles/_nav.scss @@ -269,7 +269,7 @@ top:25px; left:0; width:150px; -/* z-index:-1; */ + z-index:-1; opacity:0; transition:all 0.3s ease-in-out; &.ouvert { diff --git a/squelettes/scss/styles/_styles.scss b/squelettes/scss/styles/_styles.scss index 2022fd8..b4c4539 100644 --- a/squelettes/scss/styles/_styles.scss +++ b/squelettes/scss/styles/_styles.scss @@ -72,6 +72,9 @@ min-height: 2.5em; line-height: 2.5em; background: white; + &:focus { + outline: 0; // corriger les styles chromium + } } } diff --git a/squelettes/scss/utils/_mixins.scss b/squelettes/scss/utils/_mixins.scss index 689cbb1..27a288f 100644 --- a/squelettes/scss/utils/_mixins.scss +++ b/squelettes/scss/utils/_mixins.scss @@ -111,7 +111,7 @@ text-align: center; transition: background 0.3s; cursor: pointer; - font-family:$typo-Merriweather; + font-family:$typo-texte; border-radius:($spacer/4); background:$sombre; color:$clair !important;