From 6ab7aa037a528bace7464b763562b87515776857 Mon Sep 17 00:00:00 2001 From: Caroline Desprat Date: Tue, 2 Jul 2024 15:45:52 +0000 Subject: [PATCH] feat: update btn colors --- src/main.scss | 12 ++++++++++++ src/stories/basics/Button.stories.js | 18 +++++++++--------- src/utils/settings.scss | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/src/main.scss b/src/main.scss index 387f5e2656..598587dbd3 100644 --- a/src/main.scss +++ b/src/main.scss @@ -13,6 +13,18 @@ @import '~node_modules/bootstrap-vue-next/dist/bootstrap-vue-next.css'; // @TODO bundle Murmur so the import is easier @import '~node_modules/@icij/murmur-next/dist/lib/murmur.css'; +.btn-outline-secondary { + --#{$prefix}btn-color: var(--bs-body-color); + --#{$prefix}btn-hover-bg: #{tint-color($secondary, 90%)}; + --#{$prefix}btn-hover-color: var(--bs-body-color); + --#{$prefix}btn-active-bg: #{tint-color($secondary, 90%)}; +} +.btn-outline-tertiary { + --#{$prefix}btn-color: var(--bs-body-color); + --#{$prefix}btn-hover-bg: #{tint-color($tertiary, 60%)}; + --#{$prefix}btn-hover-color: var(--bs-body-color); + --#{$prefix}btn-active-bg: #{tint-color($tertiary, 60%)}; +} html { diff --git a/src/stories/basics/Button.stories.js b/src/stories/basics/Button.stories.js index fc0056a3d0..5af81fd5d9 100644 --- a/src/stories/basics/Button.stories.js +++ b/src/stories/basics/Button.stories.js @@ -9,7 +9,7 @@ export default { size: { control: { type: 'select' }, options: ['sm', 'md', 'lg'] }, variant: { control: { type: 'select' }, - options: ['primary', 'secondary', 'outline-secondary', 'tertiary', 'light'] + options: ['primary', 'secondary', 'outline-secondary', 'outline-tertiary', 'light'] } }, render: (args) => ({ @@ -42,56 +42,56 @@ export default { {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} Hover {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} Focus {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} Active {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} Pressed {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} Disabled {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} Loading {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} BCloseButton {{args.label}} {{args.label}} {{args.label}} - {{args.label}} + {{args.label}} diff --git a/src/utils/settings.scss b/src/utils/settings.scss index d6f616dc03..a3fbf6059f 100644 --- a/src/utils/settings.scss +++ b/src/utils/settings.scss @@ -2,7 +2,7 @@ $prefix: bs-; $primary: #112A5C; $secondary: #FA4070; -$tertiary: #FFBF57; +$tertiary: #C7C7C7; $danger: #dc3545; $warning: #FFBF57;