From e0f3f05ffd8e62e933981622e6bd5c319d52c3ea Mon Sep 17 00:00:00 2001 From: Thibaud Colas Date: Thu, 25 May 2023 13:43:45 +0100 Subject: [PATCH] Remove usage of color tokens which are duplicates --- client/scss/components/_button.scss | 18 +++++++++--------- client/scss/components/_dropdown.legacy.scss | 4 ++-- client/scss/tools/_mixins.guide-line.scss | 2 +- .../components/Draftail/Tooltip/Tooltip.scss | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/client/scss/components/_button.scss b/client/scss/components/_button.scss index 3199123403..1febf8bb1f 100644 --- a/client/scss/components/_button.scss +++ b/client/scss/components/_button.scss @@ -57,19 +57,19 @@ } &.warning { - background-color: theme('colors.surface-alert-warning'); - border-color: theme('colors.surface-alert-warning'); + background-color: theme('colors.warning.100'); + border-color: theme('colors.warning.100'); &.button-secondary { - border-color: theme('colors.surface-alert-warning'); - color: theme('colors.surface-alert-warning'); + border-color: theme('colors.warning.100'); + color: theme('colors.warning.100'); background-color: transparent; } &:hover { color: theme('colors.text-button'); border-color: transparent; - background-color: theme('colors.surface-alert-warning'); + background-color: theme('colors.warning.100'); } } @@ -77,12 +77,12 @@ &.no, &.serious { background-color: theme('colors.surface-page'); - border: 1px solid theme('colors.surface-alert-danger'); - color: theme('colors.surface-alert-danger'); + border: 1px solid theme('colors.critical.200'); + color: theme('colors.critical.200'); &:hover { - color: theme('colors.surface-alert-danger'); - border-color: theme('colors.surface-alert-danger'); + color: theme('colors.critical.200'); + border-color: theme('colors.critical.200'); background-color: theme('colors.critical.50'); } } diff --git a/client/scss/components/_dropdown.legacy.scss b/client/scss/components/_dropdown.legacy.scss index 2d08b74a2f..5fa8e9c776 100644 --- a/client/scss/components/_dropdown.legacy.scss +++ b/client/scss/components/_dropdown.legacy.scss @@ -278,11 +278,11 @@ .dropdown.warning { ul { - background-color: theme('colors.surface-alert-warning'); + background-color: theme('colors.warning.100'); } .dropdown-toggle { - background-color: theme('colors.surface-alert-warning'); + background-color: theme('colors.warning.100'); } } diff --git a/client/scss/tools/_mixins.guide-line.scss b/client/scss/tools/_mixins.guide-line.scss index 5368f97ae2..bc0772e7ef 100644 --- a/client/scss/tools/_mixins.guide-line.scss +++ b/client/scss/tools/_mixins.guide-line.scss @@ -3,7 +3,7 @@ * StreamField and InlinePanel. */ -$guide-line-default-color: theme('colors.border-dashed-block'); +$guide-line-default-color: theme('colors.border-furniture'); $stroke-width: 1px; @mixin guide-line-vertical() { diff --git a/client/src/components/Draftail/Tooltip/Tooltip.scss b/client/src/components/Draftail/Tooltip/Tooltip.scss index 185e24cb16..54812ce797 100644 --- a/client/src/components/Draftail/Tooltip/Tooltip.scss +++ b/client/src/components/Draftail/Tooltip/Tooltip.scss @@ -89,7 +89,7 @@ $tooltip-color-no: theme('colors.critical.100'); border-color: currentColor; &:hover { - color: theme('colors.surface-alert-danger'); + color: theme('colors.critical.200'); } } }