Skip to content

Commit

Permalink
fix(theming): update spinner classes to new names
Browse files Browse the repository at this point in the history
  • Loading branch information
aphex authored and brandyscarney committed Mar 20, 2018
1 parent 41f54f8 commit f578122
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/loading/loading.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/loading/loading.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/loading/loading.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/loading/loading.md.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/refresher/refresher.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
4 changes: 2 additions & 2 deletions core/src/components/refresher/refresher.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion core/src/components/spinner/spinner.ios.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/spinner/spinner.ios.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
2 changes: 1 addition & 1 deletion core/src/components/spinner/spinner.md.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions core/src/components/spinner/spinner.md.vars.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;

0 comments on commit f578122

Please sign in to comment.