From f578122d15e55c066f6a26a1671d2d405401e4bc Mon Sep 17 00:00:00 2001 From: Ross Gerbasi Date: Tue, 20 Mar 2018 12:38:13 -0400 Subject: [PATCH] fix(theming): update spinner classes to new names --- .../infinite-scroll-content.ios.scss | 4 ++-- core/src/components/loading/loading.ios.scss | 6 +++--- core/src/components/loading/loading.ios.vars.scss | 2 +- core/src/components/loading/loading.md.scss | 6 +++--- core/src/components/loading/loading.md.vars.scss | 4 ++-- core/src/components/refresher/refresher.ios.scss | 4 ++-- core/src/components/refresher/refresher.md.scss | 4 ++-- core/src/components/spinner/spinner.ios.scss | 2 +- core/src/components/spinner/spinner.ios.vars.scss | 6 +++--- core/src/components/spinner/spinner.md.scss | 2 +- core/src/components/spinner/spinner.md.vars.scss | 6 +++--- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss b/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss index 5ddd11f822..5f2eb29530 100644 --- a/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss +++ b/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss @@ -5,8 +5,8 @@ color: $infinite-scroll-ios-loading-text-color; } -.infinite-scroll-content-ios .infinite-loading-spinner .spinner-ios line, -.infinite-scroll-content-ios .infinite-loading-spinner .spinner-ios-small line, +.infinite-scroll-content-ios .infinite-loading-spinner .spinner-lines-ios line, +.infinite-scroll-content-ios .infinite-loading-spinner .spinner-lines-sm-ios line, .infinite-scroll-content-ios .infinite-loading-spinner .spinner-crescent circle { stroke: $infinite-scroll-ios-loading-color; } diff --git a/core/src/components/loading/loading.ios.scss b/core/src/components/loading/loading.ios.scss index e989dc9e37..391ecefa23 100644 --- a/core/src/components/loading/loading.ios.scss +++ b/core/src/components/loading/loading.ios.scss @@ -48,9 +48,9 @@ // iOS Loading Spinner fill colors // ----------------------------------------- -.loading-ios .spinner-ios line, -.loading-ios .spinner-ios-small line { - stroke: $loading-ios-spinner-ios-color; +.loading-ios .spinner-lines-ios line, +.loading-ios .spinner-lines-sm-ios line { + stroke: $loading-ios-spinner-lines-color; } .loading-ios .spinner-bubbles circle { diff --git a/core/src/components/loading/loading.ios.vars.scss b/core/src/components/loading/loading.ios.vars.scss index 2ee9b1a5a6..b10b78d0d5 100644 --- a/core/src/components/loading/loading.ios.vars.scss +++ b/core/src/components/loading/loading.ios.vars.scss @@ -46,7 +46,7 @@ $loading-ios-content-font-weight: bold !default; $loading-ios-spinner-color: $text-ios-color-step-400 !default; /// @prop - Color of the ios loading spinner -$loading-ios-spinner-ios-color: $loading-ios-spinner-color !default; +$loading-ios-spinner-lines-color: $loading-ios-spinner-color !default; /// @prop - Color of the bubbles loading spinner $loading-ios-spinner-bubbles-color: $loading-ios-spinner-color !default; diff --git a/core/src/components/loading/loading.md.scss b/core/src/components/loading/loading.md.scss index b527b2892d..09aa042a27 100644 --- a/core/src/components/loading/loading.md.scss +++ b/core/src/components/loading/loading.md.scss @@ -35,9 +35,9 @@ // Material Design Loading Spinner fill colors // ----------------------------------------- -.loading-md .spinner-ios line, -.loading-md .spinner-ios-small line { - stroke: $loading-md-spinner-ios-color; +.loading-md .spinner-lines-md line, +.loading-md .spinner-lines-sm-md line { + stroke: $loading-md-spinner-lines-color; } .loading-md .spinner-bubbles circle { diff --git a/core/src/components/loading/loading.md.vars.scss b/core/src/components/loading/loading.md.vars.scss index 1cf80d489a..153150e567 100644 --- a/core/src/components/loading/loading.md.vars.scss +++ b/core/src/components/loading/loading.md.vars.scss @@ -45,8 +45,8 @@ $loading-md-box-shadow: 0 16px 20px $loading-md-box-shadow-color /// @prop - Color of the loading spinner $loading-md-spinner-color: ion-color($colors-md, primary, base, md) !default; -/// @prop - Color of the ios loading spinner -$loading-md-spinner-ios-color: $loading-md-spinner-color !default; +/// @prop - Color of the lines loading spinner +$loading-md-spinner-lines-color: $loading-md-spinner-color !default; /// @prop - Color of the bubbles loading spinner $loading-md-spinner-bubbles-color: $loading-md-spinner-color !default; diff --git a/core/src/components/refresher/refresher.ios.scss b/core/src/components/refresher/refresher.ios.scss index cc49ec9af4..dead885aa0 100644 --- a/core/src/components/refresher/refresher.ios.scss +++ b/core/src/components/refresher/refresher.ios.scss @@ -14,8 +14,8 @@ color: $refresher-ios-text-color; } -.refresher-ios .refresher-refreshing .spinner-ios line, -.refresher-ios .refresher-refreshing .spinner-ios-small line, +.refresher-ios .refresher-refreshing .spinner-lines-ios line, +.refresher-ios .refresher-refreshing .spinner-lines-sm-ios line, .refresher-ios .refresher-refreshing .spinner-crescent circle { stroke: $refresher-ios-icon-color; } diff --git a/core/src/components/refresher/refresher.md.scss b/core/src/components/refresher/refresher.md.scss index eec6aaf3f5..8858036dcb 100644 --- a/core/src/components/refresher/refresher.md.scss +++ b/core/src/components/refresher/refresher.md.scss @@ -14,8 +14,8 @@ color: $refresher-md-text-color; } -.refresher-md .refresher-refreshing .spinner-ios line, -.refresher-md .refresher-refreshing .spinner-ios-small line, +.refresher-md .refresher-refreshing .spinner-lines-md line, +.refresher-md .refresher-refreshing .spinner-lines-sm-md line, .refresher-md .refresher-refreshing .spinner-crescent circle { stroke: $refresher-md-icon-color; } diff --git a/core/src/components/spinner/spinner.ios.scss b/core/src/components/spinner/spinner.ios.scss index 633dc080c7..c54658ba44 100644 --- a/core/src/components/spinner/spinner.ios.scss +++ b/core/src/components/spinner/spinner.ios.scss @@ -6,7 +6,7 @@ .spinner-lines-ios line, .spinner-lines-sm-ios line { - stroke: $spinner-ios-ios-color; + stroke: $spinner-ios-lines-color; } .spinner-bubbles-ios circle { diff --git a/core/src/components/spinner/spinner.ios.vars.scss b/core/src/components/spinner/spinner.ios.vars.scss index c6b057001e..99bdd81f27 100644 --- a/core/src/components/spinner/spinner.ios.vars.scss +++ b/core/src/components/spinner/spinner.ios.vars.scss @@ -3,8 +3,8 @@ // iOS Spinner // -------------------------------------------------- -/// @prop - Color of the ios spinner -$spinner-ios-ios-color: $text-ios-color-step-400 !default; +/// @prop - Color of the lines spinner +$spinner-ios-lines-color: $text-ios-color-step-400 !default; /// @prop - Color of the bubbles spinner $spinner-ios-bubbles-color: $text-ios-color !default; @@ -16,4 +16,4 @@ $spinner-ios-circles-color: $text-ios-color-step-400 !default; $spinner-ios-crescent-color: $text-ios-color !default; /// @prop - Color of the dots spinner -$spinner-ios-dots-color: $text-ios-color-step-400 !default; +$spinner-ios-dots-color: $text-ios-color-step-300 !default; diff --git a/core/src/components/spinner/spinner.md.scss b/core/src/components/spinner/spinner.md.scss index 7946844692..72c79abef8 100644 --- a/core/src/components/spinner/spinner.md.scss +++ b/core/src/components/spinner/spinner.md.scss @@ -6,7 +6,7 @@ .spinner-lines-md line, .spinner-lines-sm-md line { - stroke: $spinner-md-ios-color; + stroke: $spinner-md-lines-color; } .spinner-bubbles-md circle { diff --git a/core/src/components/spinner/spinner.md.vars.scss b/core/src/components/spinner/spinner.md.vars.scss index 53b9596297..61a58cbcce 100644 --- a/core/src/components/spinner/spinner.md.vars.scss +++ b/core/src/components/spinner/spinner.md.vars.scss @@ -3,8 +3,8 @@ // Material Design Spinner // -------------------------------------------------- -/// @prop - Color of the ios spinner -$spinner-md-ios-color: $text-md-color-step-400 !default; +/// @prop - Color of the lines spinner +$spinner-md-lines-color: $text-md-color-step-400 !default; /// @prop - Color of the bubbles spinner $spinner-md-bubbles-color: $text-md-color !default; @@ -16,4 +16,4 @@ $spinner-md-circles-color: $text-md-color-step-400 !default; $spinner-md-crescent-color: $text-md-color !default; /// @prop - Color of the dots spinner -$spinner-md-dots-color: $text-md-color-step-400 !default; +$spinner-md-dots-color: $text-md-color-step-300 !default;