From ea599ff12b1f8f54e8fb9658f929b5b1c9e6ce35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Wed, 21 May 2025 16:15:13 +0100 Subject: [PATCH 1/3] - Fix Progress-Bar Ionic Colors; - Change Spinner Medium Color Variation; --- core/src/components/progress-bar/progress-bar.common.scss | 7 ------- core/src/components/progress-bar/progress-bar.ionic.scss | 7 +++++++ core/src/components/progress-bar/progress-bar.native.scss | 7 +++++++ core/src/components/spinner/spinner.ionic.scss | 4 ++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/core/src/components/progress-bar/progress-bar.common.scss b/core/src/components/progress-bar/progress-bar.common.scss index a4d937f4e8e..95541ae1449 100644 --- a/core/src/components/progress-bar/progress-bar.common.scss +++ b/core/src/components/progress-bar/progress-bar.common.scss @@ -146,13 +146,6 @@ } } -:host(.ion-color) { - .progress, - .progress-indeterminate { - background: #{current-color(base)}; - } -} - // Progress Bar: Animation Keyframes // ------------------------------------------------------------------------ // Source: https://github.com/material-components/material-components-web/blob/master/packages/mdc-linear-progress/_keyframes.scss diff --git a/core/src/components/progress-bar/progress-bar.ionic.scss b/core/src/components/progress-bar/progress-bar.ionic.scss index 3ae5609d440..3fad235b07f 100644 --- a/core/src/components/progress-bar/progress-bar.ionic.scss +++ b/core/src/components/progress-bar/progress-bar.ionic.scss @@ -25,6 +25,13 @@ // Progress Bar: Color // ------------------------------------------------------------------------ +:host(.ion-color) { + .progress, + .progress-indeterminate { + background: #{globals.current-color(base)}; + } +} + :host(.ion-color) .buffer-circles { background-image: radial-gradient( ellipse at center, diff --git a/core/src/components/progress-bar/progress-bar.native.scss b/core/src/components/progress-bar/progress-bar.native.scss index 45885d5cda6..5bc8e728b77 100644 --- a/core/src/components/progress-bar/progress-bar.native.scss +++ b/core/src/components/progress-bar/progress-bar.native.scss @@ -14,6 +14,13 @@ // Progress Bar: Color // ------------------------------------------------------------------------ +:host(.ion-color) { + .progress, + .progress-indeterminate { + background: #{current-color(base)}; + } +} + :host(.ion-color) .buffer-circles { background-image: radial-gradient( ellipse at center, diff --git a/core/src/components/spinner/spinner.ionic.scss b/core/src/components/spinner/spinner.ionic.scss index 981fb26bb47..db69549ad53 100644 --- a/core/src/components/spinner/spinner.ionic.scss +++ b/core/src/components/spinner/spinner.ionic.scss @@ -11,6 +11,10 @@ height: globals.$ion-scale-700; } +:host(.ion-color.ion-color-medium) { + color: globals.current-color(contrast, null, true); +} + // Spinner: lines / lines-small / lines-sharp / lines-sharp-small // -------------------------------------------------- From a00cc6fa98f505604dc3df65ec5308d1f2cafdd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Fri, 23 May 2025 10:21:42 +0100 Subject: [PATCH 2/3] - clean selector; - improve way to get color var --- core/src/components/spinner/spinner.ionic.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/components/spinner/spinner.ionic.scss b/core/src/components/spinner/spinner.ionic.scss index db69549ad53..bda89f89e62 100644 --- a/core/src/components/spinner/spinner.ionic.scss +++ b/core/src/components/spinner/spinner.ionic.scss @@ -11,8 +11,8 @@ height: globals.$ion-scale-700; } -:host(.ion-color.ion-color-medium) { - color: globals.current-color(contrast, null, true); +:host(.ion-color-medium) { + color: #{globals.ion-color(medium, contrast, $subtle:true)} } // Spinner: lines / lines-small / lines-sharp / lines-sharp-small From 6683f18c04790c998b245030dc826a06fe40a026 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Ferreira?= Date: Fri, 23 May 2025 10:44:54 +0100 Subject: [PATCH 3/3] - lint.fix --- core/src/components/spinner/spinner.ionic.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/components/spinner/spinner.ionic.scss b/core/src/components/spinner/spinner.ionic.scss index bda89f89e62..f8fe09383f6 100644 --- a/core/src/components/spinner/spinner.ionic.scss +++ b/core/src/components/spinner/spinner.ionic.scss @@ -12,7 +12,7 @@ } :host(.ion-color-medium) { - color: #{globals.ion-color(medium, contrast, $subtle:true)} + color: #{globals.ion-color(medium, contrast, $subtle: true)}; } // Spinner: lines / lines-small / lines-sharp / lines-sharp-small