javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(item): remove the mixin for detail push from the themes

Browse Source 
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
This commit is contained in:
Brandy Carney
2016-06-08 13:09:03 -04:00
parent c41f24d8ee
commit 11d5488fdc
9 changed files with 17 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/components/item/item.ios.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$item-ios-detail-push-color}'/></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;

3
src/components/item/item.md.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$item-md-detail-push-color}'/></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;

3
src/components/item/item.wp.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='#{$item-wp-detail-push-color}'/></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;

11
src/themes/dark.ios.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='fg-color'/></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
// --------------------------------------------------

11
src/themes/dark.md.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='fg-color'/></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;

11
src/themes/dark.wp.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='fg-color'/></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;

11
src/themes/default.ios.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='fg-color'/></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
// --------------------------------------------------

11
src/themes/default.md.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='fg-color'/></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
// --------------------------------------------------

11
src/themes/default.wp.scss
View File

@@ -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: "<svg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 12 20'><path d='M2,20l-2-2l8-8L0,2l2-2l10,10L2,20z' fill='fg-color'/></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
// --------------------------------------------------