From 1abc406156ba0280c2e4974f40eea00488097909 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Bellet Date: Thu, 24 Nov 2022 14:09:34 +0100 Subject: [PATCH] Do not ignore `scss` files in `v2` folder Starts with good habits. --- .prettierignore | 2 ++ app/webpacker/css/admin/v2/navigation.scss | 12 ++++++------ app/webpacker/css/admin/v2/variables.scss | 13 +++++++++---- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/.prettierignore b/.prettierignore index 1e20bb7f65..a3eb5aad1e 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,6 +1,8 @@ # Basically, ignore everythings expect app/webpacker/controllers/*.js and app/webpacker/packs/*.js *.css *.scss +# Except v2 +!/app/webpacker/css/admin/v2/**/*.scss *.md *.yml *.yaml diff --git a/app/webpacker/css/admin/v2/navigation.scss b/app/webpacker/css/admin/v2/navigation.scss index 714a4560a6..d438cc0364 100644 --- a/app/webpacker/css/admin/v2/navigation.scss +++ b/app/webpacker/css/admin/v2/navigation.scss @@ -4,7 +4,8 @@ color: $v2-medium-dark-grey; &:hover { - a, i { + a, + i { color: $v2-orange; } } @@ -27,7 +28,8 @@ display: none; } - li a:hover, li.selected a { + li a:hover, + li.selected a { background-color: $v2-orange-light; span { @@ -40,7 +42,6 @@ } } - #sub-menu { background-color: $v2-orange-light; @@ -48,10 +49,10 @@ font-size: 100%; } - li a:hover, li.selected a { + li a:hover, + li.selected a { text-shadow: 1px 1px 9px $v2-orange; background-color: lighten($v2-orange-light, 7%); - &:after { display: none; } @@ -66,4 +67,3 @@ color: $v2-medium-dark-grey; } } - diff --git a/app/webpacker/css/admin/v2/variables.scss b/app/webpacker/css/admin/v2/variables.scss index 1eba6e0a5c..a565114e63 100644 --- a/app/webpacker/css/admin/v2/variables.scss +++ b/app/webpacker/css/admin/v2/variables.scss @@ -1,9 +1,14 @@ // Should finally replace (or at least complete) the file /admin/globale/variables.scss -$v2-orange: #F27052; -$v2-orange-light: #F5947D; -$v2-orange-lighter: #F8B7A8; -$v2-orange-lightest: #FCDBD4; +$v2-orange: #f27052; +$v2-orange-light: #f5947d; +$v2-orange-lighter: #f8b7a8; +$v2-orange-lightest: #fcdbd4; $v2-dark-grey: #333333; $v2-medium-dark-grey: #444444; +$v2-medium-grey: #717171; +$v2-light-grey: #e7e7e7; + +$v2-blue: #017a9a; +$v2-blue-light: #0096ad;