From 11d5488fdc79480394dd06801995d9d0fabd4be1 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 8 Jun 2016 13:09:03 -0400 Subject: [PATCH] style(item): remove the mixin for detail push from the themes added the sass variable for the color directly to the svg instead. This will help with future themes since the mixin was just being copied over. references #5993 --- src/components/item/item.ios.scss | 25 +++++++++++++------------ src/components/item/item.md.scss | 3 ++- src/components/item/item.wp.scss | 3 ++- src/themes/dark.ios.scss | 11 ----------- src/themes/dark.md.scss | 11 ----------- src/themes/dark.wp.scss | 11 ----------- src/themes/default.ios.scss | 11 ----------- src/themes/default.md.scss | 11 ----------- src/themes/default.wp.scss | 11 ----------- 9 files changed, 17 insertions(+), 80 deletions(-) diff --git a/src/components/item/item.ios.scss b/src/components/item/item.ios.scss index 7af4790ac8..4701917f37 100644 --- a/src/components/item/item.ios.scss +++ b/src/components/item/item.ios.scss @@ -4,21 +4,22 @@ // iOS Item // -------------------------------------------------- -$item-ios-body-text-font-size: 1.6rem !default; -$item-ios-paragraph-text-color: #666 !default; +$item-ios-body-text-font-size: 1.6rem !default; +$item-ios-paragraph-text-color: #666 !default; -$item-ios-avatar-size: 3.6rem !default; -$item-ios-thumbnail-size: 5.6rem !default; -$item-ios-note-color: darken($list-ios-border-color, 10%) !default; +$item-ios-avatar-size: 3.6rem !default; +$item-ios-thumbnail-size: 5.6rem !default; +$item-ios-note-color: darken($list-ios-border-color, 10%) !default; -$item-ios-detail-push-show: true !default; -$item-ios-detail-push-color: $list-ios-border-color !default; +$item-ios-detail-push-show: true !default; +$item-ios-detail-push-color: $list-ios-border-color !default; +$item-ios-detail-push-svg: "" !default; -$item-ios-divider-background: #f7f7f7 !default; -$item-ios-divider-color: #222 !default; -$item-ios-divider-padding: 5px 15px !default; +$item-ios-divider-background: #f7f7f7 !default; +$item-ios-divider-color: #222 !default; +$item-ios-divider-padding: 5px 15px !default; -$item-ios-sliding-content-background: $list-ios-background-color !default; +$item-ios-sliding-content-background: $list-ios-background-color !default; // iOS Item @@ -170,7 +171,7 @@ ion-note { // -------------------------------------------------- @mixin ios-detail-push() { - @include ios-detail-push-icon($item-ios-detail-push-color); + @include svg-background-image($item-ios-detail-push-svg); padding-right: 32px; diff --git a/src/components/item/item.md.scss b/src/components/item/item.md.scss index eed37782cb..bacff0715d 100644 --- a/src/components/item/item.md.scss +++ b/src/components/item/item.md.scss @@ -15,6 +15,7 @@ $item-md-note-color: darken($list-md-border-color, 10%) !default $item-md-detail-push-show: false !default; $item-md-detail-push-color: $list-md-border-color !default; +$item-md-detail-push-svg: "" !default; $item-md-divider-background: #fff !default; $item-md-divider-color: #222 !default; @@ -91,7 +92,7 @@ $item-md-sliding-content-background: $list-md-background-color !default; // -------------------------------------------------- @mixin md-detail-push() { - @include md-detail-push-icon($item-md-detail-push-color); + @include svg-background-image($item-md-detail-push-svg); padding-right: 32px; diff --git a/src/components/item/item.wp.scss b/src/components/item/item.wp.scss index 77d06a0a60..e9027907cf 100644 --- a/src/components/item/item.wp.scss +++ b/src/components/item/item.wp.scss @@ -17,6 +17,7 @@ $item-wp-note-color: $input-wp-border-color !default; $item-wp-detail-push-show: false !default; $item-wp-detail-push-color: $input-wp-border-color !default; +$item-wp-detail-push-svg: "" !default; $item-wp-divider-background: #fff !default; $item-wp-divider-color: #222 !default; @@ -92,7 +93,7 @@ $item-wp-sliding-content-background: $list-wp-background-color !default; // -------------------------------------------------- @mixin wp-detail-push() { - @include wp-detail-push-icon($item-wp-detail-push-color); + @include svg-background-image($item-wp-detail-push-svg); padding-right: 32px; diff --git a/src/themes/dark.ios.scss b/src/themes/dark.ios.scss index 2b69d3a65f..3e975a86ef 100644 --- a/src/themes/dark.ios.scss +++ b/src/themes/dark.ios.scss @@ -71,17 +71,6 @@ $item-ios-padding-icon-top: 10px !default; $item-ios-padding-icon-bottom: 9px !default; -// iOS Item Push Icon -// -------------------------------------------------- - -$icon-detail-push-background-svg: "" !default; - -@mixin ios-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, "fg-color", $fg-color); - @include svg-background-image($svg); -} - - // iOS Toggle // -------------------------------------------------- diff --git a/src/themes/dark.md.scss b/src/themes/dark.md.scss index e7b5ee6d52..edb296849b 100644 --- a/src/themes/dark.md.scss +++ b/src/themes/dark.md.scss @@ -60,17 +60,6 @@ $item-md-divider-background: #151515 !default; $item-md-divider-color: color($colors-md, light) !default; -// Material Design Item Push Icon -// -------------------------------------------------- - -$icon-detail-push-background-svg: "" !default; - -@mixin md-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, "fg-color", $fg-color); - @include svg-background-image($svg); -} - - // Material Design Toggle // --------------------------------------------------- $toggle-md-handle-background-color-off: color($colors-md, light) !default; diff --git a/src/themes/dark.wp.scss b/src/themes/dark.wp.scss index 78e4953193..18cb8347a0 100644 --- a/src/themes/dark.wp.scss +++ b/src/themes/dark.wp.scss @@ -60,17 +60,6 @@ $item-wp-divider-background: #151515 !default; $item-wp-divider-color: color($colors-wp, light) !default; -// Windows Item Push Icon -// -------------------------------------------------- - -$icon-detail-push-background-svg: "" !default; - -@mixin wp-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, "fg-color", $fg-color); - @include svg-background-image($svg); -} - - // Windows Toggle // --------------------------------------------------- $toggle-wp-handle-background-color-off: color($colors-wp, light) !default; diff --git a/src/themes/default.ios.scss b/src/themes/default.ios.scss index 22bf54b34a..a8980a8481 100644 --- a/src/themes/default.ios.scss +++ b/src/themes/default.ios.scss @@ -48,17 +48,6 @@ $item-ios-padding-icon-top: 10px !default; $item-ios-padding-icon-bottom: 9px !default; -// iOS Item Push Icon -// -------------------------------------------------- - -$icon-detail-push-background-svg: "" !default; - -@mixin ios-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, "fg-color", $fg-color); - @include svg-background-image($svg); -} - - // iOS Body // -------------------------------------------------- diff --git a/src/themes/default.md.scss b/src/themes/default.md.scss index 7992991906..3f7e49cbd8 100644 --- a/src/themes/default.md.scss +++ b/src/themes/default.md.scss @@ -48,17 +48,6 @@ $item-md-padding-icon-top: 11px !default; $item-md-padding-icon-bottom: 10px !default; -// Material Design Item Push Icon -// -------------------------------------------------- - -$icon-detail-push-background-svg: "" !default; - -@mixin md-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, "fg-color", $fg-color); - @include svg-background-image($svg); -} - - // Material Design Body // -------------------------------------------------- diff --git a/src/themes/default.wp.scss b/src/themes/default.wp.scss index be0eb70a5b..de24e4e744 100644 --- a/src/themes/default.wp.scss +++ b/src/themes/default.wp.scss @@ -48,17 +48,6 @@ $item-wp-padding-icon-top: 11px !default; $item-wp-padding-icon-bottom: 10px !default; -// Windows Item Push Icon -// -------------------------------------------------- - -$icon-detail-push-background-svg: "" !default; - -@mixin wp-detail-push-icon($fg-color) { - $svg: str-replace($icon-detail-push-background-svg, "fg-color", $fg-color); - @include svg-background-image($svg); -} - - // Windows Input // --------------------------------------------------