diff --git a/ionic/components/icon/modes/ios.scss b/ionic/components/icon/modes/ios.scss index 64a8de114c..e4cec48e57 100644 --- a/ionic/components/icon/modes/ios.scss +++ b/ionic/components/icon/modes/ios.scss @@ -3,10 +3,10 @@ // -------------------------------------------------- -$icon-forward-ios-background-svg: "" !default; +$icon-detail-push-background-svg: "" !default; -@mixin ios-icon-forward($fg-color) { - $svg: str-replace($icon-forward-ios-background-svg, 'fg-color', $fg-color); +@mixin ios-detail-push-icon($fg-color) { + $svg: str-replace($icon-detail-push-background-svg, 'fg-color', $fg-color); @include svg-background-image($svg); } diff --git a/ionic/components/icon/test/basic/main.html b/ionic/components/icon/test/basic/main.html index 9aecc23dac..d674a97f18 100644 --- a/ionic/components/icon/test/basic/main.html +++ b/ionic/components/icon/test/basic/main.html @@ -77,9 +77,9 @@ - + - ion-item w/ [forward-icon] attr. text text text text text text + ion-item w/ [detail-push] attr. text text text text text text diff --git a/ionic/components/item/modes/ios.scss b/ionic/components/item/modes/ios.scss index f3e10ad330..855325dbd0 100644 --- a/ionic/components/item/modes/ios.scss +++ b/ionic/components/item/modes/ios.scss @@ -20,7 +20,7 @@ $item-ios-padding-icon-bottom: 10px !default; $item-ios-avatar-size: 3.6rem !default; $item-ios-thumbnail-size: 5.6rem !default; $item-ios-note-color: darken($item-ios-border-color, 10%) !default; -$item-ios-forward-icon-color: $item-ios-border-color !default; +$item-ios-detail-push-color: $item-ios-border-color !default; $item-ios-divider-bg: #f5f5f5 !default; $item-ios-divider-color: #222 !default; @@ -174,10 +174,10 @@ button.item { .list, .card { - button[ion-item]:not([no-forward-icon]), - a[ion-item]:not([no-forward-icon]), - [forward-icon] { - @include ios-icon-forward($item-ios-forward-icon-color); + button[ion-item]:not([detail-none]), + a[ion-item]:not([detail-push]), + [detail-push] { + @include ios-detail-push-icon($item-ios-detail-push-color); background-repeat: no-repeat; background-position: right ($item-ios-padding-right - 2) center; background-size: 14px 14px; diff --git a/ionic/components/item/modes/md.scss b/ionic/components/item/modes/md.scss index c5aeef0abf..384836a2ef 100644 --- a/ionic/components/item/modes/md.scss +++ b/ionic/components/item/modes/md.scss @@ -23,7 +23,7 @@ $item-md-body-text-line-height: 1.5 !default; $item-md-avatar-size: 4rem !default; $item-md-thumbnail-size: 8rem !default; $item-md-note-color: darken($item-md-border-color, 10%) !default; -$item-md-forward-icon-color: $item-md-border-color !default; +$item-md-detail-push-color: $item-md-border-color !default; $item-md-divider-bg: #fff !default; $item-md-divider-color: #222 !default; diff --git a/ionic/components/item/test/icons/main.html b/ionic/components/item/test/icons/main.html index 895c224360..e23e172f74 100644 --- a/ionic/components/item/test/icons/main.html +++ b/ionic/components/item/test/icons/main.html @@ -2,16 +2,16 @@ - - ion-item [forward-icon] attr + + ion-item [detail-push] attr - a[ion-item] w/ forward icon + a[ion-item] w/ push detail @@ -34,10 +34,9 @@ button[ion-item] w/ left side icon - diff --git a/ionic/components/menu/test/basic/main.html b/ionic/components/menu/test/basic/main.html index fed10a13e7..0d6f204fd3 100644 --- a/ionic/components/menu/test/basic/main.html +++ b/ionic/components/menu/test/basic/main.html @@ -12,7 +12,7 @@ {{p.title}} - diff --git a/ionic/components/menu/test/overlay/main.html b/ionic/components/menu/test/overlay/main.html index b57f7ac004..c63832c9dd 100644 --- a/ionic/components/menu/test/overlay/main.html +++ b/ionic/components/menu/test/overlay/main.html @@ -8,7 +8,7 @@ - diff --git a/ionic/components/menu/test/reveal/main.html b/ionic/components/menu/test/reveal/main.html index dcacb9ef66..3d90be8de0 100644 --- a/ionic/components/menu/test/reveal/main.html +++ b/ionic/components/menu/test/reveal/main.html @@ -8,7 +8,7 @@ -