diff --git a/apps/daffio/src/app/content/why-pwa/components/feature-comparison/feature-comparison-theme.scss b/apps/daffio/src/app/content/why-pwa/components/feature-comparison/feature-comparison-theme.scss index 3d0bc3330b..05e2c1a87c 100644 --- a/apps/daffio/src/app/content/why-pwa/components/feature-comparison/feature-comparison-theme.scss +++ b/apps/daffio/src/app/content/why-pwa/components/feature-comparison/feature-comparison-theme.scss @@ -2,7 +2,7 @@ @use 'theme' as daff-theme; @mixin daffio-feature-comparison-theme($theme){ - $secondary: map.get($theme, secondary); + $secondary: daff-theme.daff-map-get($theme, secondary); $base: daff-theme.daff-map-get($theme, 'core', 'base'); $base-contrast: daff-theme.daff-map-get($theme, 'core','base-contrast'); diff --git a/apps/daffio/src/app/core/footer/footer/footer-theme.scss b/apps/daffio/src/app/core/footer/footer/footer-theme.scss index 2bffe1134d..a43892b8dd 100644 --- a/apps/daffio/src/app/core/footer/footer/footer-theme.scss +++ b/apps/daffio/src/app/core/footer/footer/footer-theme.scss @@ -5,7 +5,7 @@ $neutral: daff-theme.daff-map-get($theme, 'core', 'neutral'); $base: daff-theme.daff-map-get($theme, 'core', 'base'); $base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast'); - $secondary: map.get($theme, secondary); + $secondary: daff-theme.daff-map-get($theme, secondary); .daffio-footer { border-top: 1px solid daff-theme.daff-illuminate($base, $neutral, 2); diff --git a/apps/daffio/src/app/core/footer/sub-footer/sub-footer-theme.scss b/apps/daffio/src/app/core/footer/sub-footer/sub-footer-theme.scss index 6e3fac8956..bc9010a753 100644 --- a/apps/daffio/src/app/core/footer/sub-footer/sub-footer-theme.scss +++ b/apps/daffio/src/app/core/footer/sub-footer/sub-footer-theme.scss @@ -2,7 +2,7 @@ @use 'theme' as daff-theme; @mixin daffio-sub-footer-theme($theme) { - $secondary: map.get($theme, secondary); + $secondary: daff-theme.daff-map-get($theme, secondary); .daffio-sub-footer { background: linear-gradient( diff --git a/apps/daffio/src/app/core/header/components/header/header-theme.scss b/apps/daffio/src/app/core/header/components/header/header-theme.scss index eeffeac095..d3a85f2bb9 100644 --- a/apps/daffio/src/app/core/header/components/header/header-theme.scss +++ b/apps/daffio/src/app/core/header/components/header/header-theme.scss @@ -2,7 +2,7 @@ @use 'theme' as daff-theme; @mixin daffio-header-theme($theme) { - $primary: map.get($theme, primary); + $primary: daff-theme.daff-map-get($theme, primary); .daffio-header-item { &.active { diff --git a/apps/daffio/src/app/core/sidebar/components/sidebar-footer/sidebar-footer-theme.scss b/apps/daffio/src/app/core/sidebar/components/sidebar-footer/sidebar-footer-theme.scss index 04330c1548..4962e2f97b 100644 --- a/apps/daffio/src/app/core/sidebar/components/sidebar-footer/sidebar-footer-theme.scss +++ b/apps/daffio/src/app/core/sidebar/components/sidebar-footer/sidebar-footer-theme.scss @@ -5,7 +5,7 @@ $neutral: daff-theme.daff-map-get($theme, 'core', 'neutral'); $base: daff-theme.daff-map-get($theme, 'core', 'base'); $base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast'); - $primary: map.get($theme, primary); + $primary: daff-theme.daff-map-get($theme, primary); .daffio-sidebar-footer { background: daff-theme.daff-illuminate($base, $neutral, 2); diff --git a/apps/daffio/src/scss/type-descriptors/_mixins.scss b/apps/daffio/src/scss/type-descriptors/_mixins.scss index 35dac2bc2d..1c76c03a3e 100644 --- a/apps/daffio/src/scss/type-descriptors/_mixins.scss +++ b/apps/daffio/src/scss/type-descriptors/_mixins.scss @@ -2,9 +2,9 @@ @use 'theme' as daff-theme; @use 'utilities' as daff; -$primary: map.get(daff-theme.$theme, primary); -$secondary: map.get(daff-theme.$theme, secondary); -$tertiary: map.get(daff-theme.$theme, tertiary); +$primary: daff-theme.daff-map-get(daff-theme.$theme, primary); +$secondary: daff-theme.daff-map-get(daff-theme.$theme, secondary); +$tertiary: daff-theme.daff-map-get(daff-theme.$theme, tertiary); $base: daff-theme.daff-map-get(daff-theme.$theme, 'core', 'base'); $base-contrast: daff-theme.daff-map-get( daff-theme.$theme, diff --git a/apps/design-land/src/app/core/code-preview/component/code-preview-theme.scss b/apps/design-land/src/app/core/code-preview/component/code-preview-theme.scss index 82a7274c7a..2f33b16f9c 100644 --- a/apps/design-land/src/app/core/code-preview/component/code-preview-theme.scss +++ b/apps/design-land/src/app/core/code-preview/component/code-preview-theme.scss @@ -4,7 +4,7 @@ @mixin code-preview-theme($theme) { $neutral: daff-theme.daff-map-get($theme, 'core', 'neutral'); $base: daff-theme.daff-map-get($theme, 'core', 'base'); - $primary: map.get(daff-theme.$theme, primary); + $primary: daff-theme.daff-map-get(daff-theme.$theme, primary); $font-color: daff-theme.daff-map-get($theme, 'core', 'font-color'); $border: 1px solid daff-theme.daff-illuminate($base, $neutral, 2); diff --git a/apps/design-land/src/app/core/sidebar-viewport/sidebar-viewport-theme.scss b/apps/design-land/src/app/core/sidebar-viewport/sidebar-viewport-theme.scss index 6b4d025943..07bc261cab 100644 --- a/apps/design-land/src/app/core/sidebar-viewport/sidebar-viewport-theme.scss +++ b/apps/design-land/src/app/core/sidebar-viewport/sidebar-viewport-theme.scss @@ -5,7 +5,7 @@ $neutral: daff-theme.daff-map-get($theme, 'core', 'neutral'); $base: daff-theme.daff-map-get($theme, 'core', 'base'); $base-contrast: daff-theme.daff-map-get($theme, 'core', 'base-contrast'); - $primary: map.get($theme, primary); + $primary: daff-theme.daff-map-get($theme, primary); .design-land-sidebar-viewport { &__sidebar { diff --git a/libs/design/article/src/article-theme.scss b/libs/design/article/src/article-theme.scss index 9daad7b3dc..14fd52130f 100644 --- a/libs/design/article/src/article-theme.scss +++ b/libs/design/article/src/article-theme.scss @@ -4,9 +4,9 @@ @use '../../scss/theming'; @mixin daff-article-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/button/src/button/basic/button-theme.scss b/libs/design/button/src/button/basic/button-theme.scss index 18ea4d40f1..fb846c4cbf 100644 --- a/libs/design/button/src/button/basic/button-theme.scss +++ b/libs/design/button/src/button/basic/button-theme.scss @@ -28,13 +28,13 @@ } @mixin daff-button-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/button/src/button/flat/flat-theme.scss b/libs/design/button/src/button/flat/flat-theme.scss index fb1d567403..9da269e4a0 100644 --- a/libs/design/button/src/button/flat/flat-theme.scss +++ b/libs/design/button/src/button/flat/flat-theme.scss @@ -23,13 +23,13 @@ } @mixin daff-flat-button-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/button/src/button/icon/icon-theme.scss b/libs/design/button/src/button/icon/icon-theme.scss index 759661ae3a..2d0feea428 100644 --- a/libs/design/button/src/button/icon/icon-theme.scss +++ b/libs/design/button/src/button/icon/icon-theme.scss @@ -24,13 +24,13 @@ } @mixin daff-icon-button-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/button/src/button/raised/raised-theme.scss b/libs/design/button/src/button/raised/raised-theme.scss index 574910e191..67f7582e2e 100644 --- a/libs/design/button/src/button/raised/raised-theme.scss +++ b/libs/design/button/src/button/raised/raised-theme.scss @@ -40,13 +40,13 @@ } @mixin daff-raised-button-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/button/src/button/stroked/stroked-theme.scss b/libs/design/button/src/button/stroked/stroked-theme.scss index 449ebc1c9b..c2a68a7ec3 100644 --- a/libs/design/button/src/button/stroked/stroked-theme.scss +++ b/libs/design/button/src/button/stroked/stroked-theme.scss @@ -26,13 +26,13 @@ } @mixin daff-stroked-button-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/button/src/button/underline/underline-theme.scss b/libs/design/button/src/button/underline/underline-theme.scss index 720af9cb77..0506248f18 100644 --- a/libs/design/button/src/button/underline/underline-theme.scss +++ b/libs/design/button/src/button/underline/underline-theme.scss @@ -11,13 +11,13 @@ } @mixin daff-underline-button-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/callout/src/callout-theme.scss b/libs/design/callout/src/callout-theme.scss index 3b0dbd6baa..f67c6bc6ab 100644 --- a/libs/design/callout/src/callout-theme.scss +++ b/libs/design/callout/src/callout-theme.scss @@ -8,9 +8,9 @@ } @mixin daff-callout-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); diff --git a/libs/design/card/src/card-theme.scss b/libs/design/card/src/card-theme.scss index 32be481fc5..a9b9eeeacd 100644 --- a/libs/design/card/src/card-theme.scss +++ b/libs/design/card/src/card-theme.scss @@ -6,9 +6,9 @@ @use './card-theme-variants/linkable-card' as linkable; @mixin daff-card-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/hero/src/hero-theme.scss b/libs/design/hero/src/hero-theme.scss index ff45a09c8a..15fcce9df0 100644 --- a/libs/design/hero/src/hero-theme.scss +++ b/libs/design/hero/src/hero-theme.scss @@ -8,9 +8,9 @@ } @mixin daff-hero-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); diff --git a/libs/design/loading-icon/src/loading-icon-theme.scss b/libs/design/loading-icon/src/loading-icon-theme.scss index 1367586e8f..a50f9f2006 100644 --- a/libs/design/loading-icon/src/loading-icon-theme.scss +++ b/libs/design/loading-icon/src/loading-icon-theme.scss @@ -3,9 +3,9 @@ @use '../../scss/theming'; @mixin daff-loading-icon-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/navbar/src/navbar-theme.scss b/libs/design/navbar/src/navbar-theme.scss index bd72baa6f9..596290318e 100644 --- a/libs/design/navbar/src/navbar-theme.scss +++ b/libs/design/navbar/src/navbar-theme.scss @@ -8,9 +8,9 @@ } @mixin daff-navbar-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); diff --git a/libs/design/notification/src/notification-theme.scss b/libs/design/notification/src/notification-theme.scss index 86054cc94d..76015b181c 100644 --- a/libs/design/notification/src/notification-theme.scss +++ b/libs/design/notification/src/notification-theme.scss @@ -3,13 +3,13 @@ @use '../../scss/theming'; @mixin daff-notification-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); diff --git a/libs/design/paginator/src/paginator-theme.scss b/libs/design/paginator/src/paginator-theme.scss index c910461a2f..304db0e89f 100644 --- a/libs/design/paginator/src/paginator-theme.scss +++ b/libs/design/paginator/src/paginator-theme.scss @@ -3,9 +3,9 @@ @use '../../scss/theming'; @mixin daff-paginator-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/progress-bar/src/progress-bar-theme.scss b/libs/design/progress-bar/src/progress-bar-theme.scss index 469563a34f..14763387c5 100644 --- a/libs/design/progress-bar/src/progress-bar-theme.scss +++ b/libs/design/progress-bar/src/progress-bar-theme.scss @@ -3,9 +3,9 @@ @use '../../scss/theming'; @mixin daff-progress-bar-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white'); diff --git a/libs/design/scss/theming/_theme-css-variables.scss b/libs/design/scss/theming/_theme-css-variables.scss index 8fbda6d94e..b6c2737f39 100644 --- a/libs/design/scss/theming/_theme-css-variables.scss +++ b/libs/design/scss/theming/_theme-css-variables.scss @@ -8,9 +8,9 @@ @mixin daff-root-theme-tokens($theme) { $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $white: core.daff-map-get($theme, 'core', 'white'); $black: core.daff-map-get($theme, 'core', 'black'); diff --git a/libs/design/src/atoms/form/form-field/form-field/form-field-theme.scss b/libs/design/src/atoms/form/form-field/form-field/form-field-theme.scss index 9ed63347f5..4a11e8002a 100644 --- a/libs/design/src/atoms/form/form-field/form-field/form-field-theme.scss +++ b/libs/design/src/atoms/form/form-field/form-field/form-field-theme.scss @@ -3,9 +3,9 @@ @use '../../../../../scss/theming'; @mixin daff-form-field-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $neutral: core.daff-map-get($theme, 'core', 'neutral'); diff --git a/libs/design/tabs/src/tabs-theme.scss b/libs/design/tabs/src/tabs-theme.scss index d6cd4fc772..1bfb0a5a2d 100644 --- a/libs/design/tabs/src/tabs-theme.scss +++ b/libs/design/tabs/src/tabs-theme.scss @@ -3,9 +3,9 @@ @use '../../scss/theming'; @mixin daff-tabs-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); diff --git a/libs/design/toast/src/toast-theme.scss b/libs/design/toast/src/toast-theme.scss index 1c5cea8054..e88764b9b3 100644 --- a/libs/design/toast/src/toast-theme.scss +++ b/libs/design/toast/src/toast-theme.scss @@ -3,13 +3,13 @@ @use '../../scss/theming'; @mixin daff-toast-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); - $info: map.get($theme, info); - $warn: map.get($theme, warn); - $critical: map.get($theme, critical); - $success: map.get($theme, success); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); + $info: core.daff-map-get($theme, informational); + $warn: core.daff-map-get($theme, warn); + $critical: core.daff-map-get($theme, critical); + $success: core.daff-map-get($theme, success); $neutral: core.daff-map-get($theme, 'core', 'neutral'); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); diff --git a/libs/design/tree/src/tree-theme.scss b/libs/design/tree/src/tree-theme.scss index bca93d1a15..738c7e2a3a 100644 --- a/libs/design/tree/src/tree-theme.scss +++ b/libs/design/tree/src/tree-theme.scss @@ -3,9 +3,9 @@ @use '../../scss/core'; @mixin daff-tree-theme($theme) { - $primary: map.get($theme, primary); - $secondary: map.get($theme, secondary); - $tertiary: map.get($theme, tertiary); + $primary: core.daff-map-get($theme, primary); + $secondary: core.daff-map-get($theme, secondary); + $tertiary: core.daff-map-get($theme, tertiary); $base: core.daff-map-get($theme, 'core', 'base'); $base-contrast: core.daff-map-get($theme, 'core', 'base-contrast'); $white: core.daff-map-get($theme, 'core', 'white');