From 017921dce077e06db9a33ed41a76e6cec5adce7b Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Mon, 20 Jul 2020 11:21:11 +0000 Subject: [PATCH] feat(progress-circle): Switched theming to custom properties. --- .../src/_progress-circle-theme.scss | 38 ++++++++++--------- .../progress-circle/src/progress-circle.scss | 8 +--- 2 files changed, 21 insertions(+), 25 deletions(-) diff --git a/libs/barista-components/progress-circle/src/_progress-circle-theme.scss b/libs/barista-components/progress-circle/src/_progress-circle-theme.scss index 234c7fb01b..727fe9c971 100644 --- a/libs/barista-components/progress-circle/src/_progress-circle-theme.scss +++ b/libs/barista-components/progress-circle/src/_progress-circle-theme.scss @@ -1,21 +1,23 @@ -@import '../../core/src/theming/theming'; - -@mixin dt-theme-progress-circle($theme) { - $palette-names: 'main', 'accent', 'warning', 'recovered', 'error'; - $default-palette: 'main'; - - @each $name in $palette-names { - $is-dark: map-get($theme, 'is-dark'); - $palette: dt-get-theme-palette($theme, $name); - $default-color: dt-get-theme-color($palette, 'default'); +:host.dt-color-main { + --dt-progress-circle-color: var(--dt-theme-main-default-color); +} +:host.dt-color-accent { + --dt-progress-circle-color: var(--dt-accent-default-color); +} +:host.dt-color-warning { + --dt-progress-circle-color: var(--dt-warning-default-color); +} +:host.dt-color-recovered { + --dt-progress-circle-color: var(--dt-recovered-default-color); +} +:host.dt-color-error { + --dt-progress-circle-color: var(--dt-error-default-color); +} - $namespace: ':host'; - @if $name != $default-palette { - $namespace: ':host.dt-color-#{$name}'; - } +.dt-theme-dark :host { + color: #ffffff; +} - #{$namespace} .dt-progress-circle-progress { - stroke: $default-color; - } - } +:host .dt-progress-circle-progress { + stroke: var(--dt-progress-circle-color); } diff --git a/libs/barista-components/progress-circle/src/progress-circle.scss b/libs/barista-components/progress-circle/src/progress-circle.scss index 75714f03d2..d186895bb4 100644 --- a/libs/barista-components/progress-circle/src/progress-circle.scss +++ b/libs/barista-components/progress-circle/src/progress-circle.scss @@ -1,7 +1,4 @@ @import '../../style/font-mixins'; -@import '../../core/src/style/variables'; -@import '../../core/src/theming/theming'; -@import './progress-circle-theme'; :host { display: inline-block; @@ -48,7 +45,4 @@ } } -// Apply the progress-circle theme to all theme definitions -@include dt-apply-theme() { - @include dt-theme-progress-circle($dt-current-theme); -} +@import './progress-circle-theme';