From 8efc401811eec95cd75cb839d380a1d82438f76a Mon Sep 17 00:00:00 2001 From: Davide Negretti Date: Fri, 2 Feb 2024 13:45:48 +0100 Subject: [PATCH] [DURACOM-195] fix prefix of custom CSS variables (cherry picked from commit 46fe7f63e316c7e14ff41e05dfcbbbf39567faf1) --- .../dso-edit-metadata-shared/dso-edit-metadata-cells.scss | 6 +++--- .../dso-edit-metadata-value.component.scss | 2 +- .../dso-edit-metadata/dso-edit-metadata.component.scss | 2 +- src/styles/_bootstrap_variables_mapping.scss | 6 ------ src/styles/_custom_variables.scss | 8 ++++++++ 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss index 20d479ac88..29b93f3150 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-shared/dso-edit-metadata-cells.scss @@ -24,7 +24,7 @@ } &.ds-warning { - background-color: var(--bs-warning-bg); + background-color: var(--ds-warning-bg); .ds-flex-cell { border: 1px solid var(--bs-warning); @@ -32,7 +32,7 @@ } &.ds-danger { - background-color: var(--bs-danger-bg); + background-color: var(--ds-danger-bg); .ds-flex-cell { border: 1px solid var(--bs-danger); @@ -40,7 +40,7 @@ } &.ds-success { - background-color: var(--bs-success-bg); + background-color: var(--ds-success-bg); .ds-flex-cell { border: 1px solid var(--bs-success); diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss index 4a207ee1a4..e555191300 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata-value/dso-edit-metadata-value.component.scss @@ -1,5 +1,5 @@ .ds-success { - background-color: var(--bs-success-bg); + background-color: var(--ds-success-bg); border: 1px solid var(--bs-success); } diff --git a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss index 4e5e9ff1d4..3a181fd130 100644 --- a/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss +++ b/src/app/dso-shared/dso-edit-metadata/dso-edit-metadata.component.scss @@ -7,7 +7,7 @@ border: 1px solid var(--bs-gray-200); &.ds-success { - background-color: var(--bs-success-bg); + background-color: var(--ds-success-bg); border: 1px solid var(--bs-success); } } diff --git a/src/styles/_bootstrap_variables_mapping.scss b/src/styles/_bootstrap_variables_mapping.scss index 04ed5a7850..5a64be7e2a 100644 --- a/src/styles/_bootstrap_variables_mapping.scss +++ b/src/styles/_bootstrap_variables_mapping.scss @@ -29,17 +29,11 @@ --bs-teal: #{$teal}; --bs-cyan: #{$cyan}; --bs-primary: #{$primary}; - --bs-primary-bg: #{$ds-primary-bg}; --bs-secondary: #{$secondary}; - --bs-secondary-bg: #{$ds-secondary-bg}; --bs-success: #{$success}; - --bs-success-bg: #{$ds-success-bg}; --bs-info: #{$info}; - --bs-info-bg: #{$ds-info-bg}; --bs-warning: #{$warning}; - --bs-warning-bg: #{$ds-warning-bg}; --bs-danger: #{$danger}; - --bs-danger-bg: #{$ds-danger-bg}; --bs-light: #{$light}; --bs-dark: #{$dark}; diff --git a/src/styles/_custom_variables.scss b/src/styles/_custom_variables.scss index 82b5fb28e2..3631fa7e29 100644 --- a/src/styles/_custom_variables.scss +++ b/src/styles/_custom_variables.scss @@ -124,4 +124,12 @@ --ds-comcol-logo-max-width: 500px; --ds-comcol-logo-max-height: 500px; + + --ds-primary-bg: #{$ds-primary-bg}; + --ds-secondary-bg: #{$ds-secondary-bg}; + --ds-success-bg: #{$ds-success-bg}; + --ds-info-bg: #{$ds-info-bg}; + --ds-warning-bg: #{$ds-warning-bg}; + --ds-danger-bg: #{$ds-danger-bg}; + }