diff --git a/ionic/components/action-sheet/action-sheet.ts b/ionic/components/action-sheet/action-sheet.ts index d17bc9f3fb..e3761ceadc 100644 --- a/ionic/components/action-sheet/action-sheet.ts +++ b/ionic/components/action-sheet/action-sheet.ts @@ -197,16 +197,10 @@ class ActionSheetCmp { } if (button.style === 'cancel') { - if (!button.icon) { - button.icon = this._config.get('actionSheetCancelIcon'); - } this.d.cancelButton = button; } else { if (button.style === 'destructive') { - if (!button.icon) { - button.icon = this._config.get('actionSheetDestructiveIcon'); - } button.cssClass = (button.cssClass + ' ' || '') + 'action-sheet-destructive'; } buttons.push(button); diff --git a/ionic/components/text-input/test/input-focus/main.html b/ionic/components/text-input/test/input-focus/main.html index 0fb2fa1569..dc4ec0c07b 100644 --- a/ionic/components/text-input/test/input-focus/main.html +++ b/ionic/components/text-input/test/input-focus/main.html @@ -116,11 +116,11 @@ Radios - + Radio 1 - + Radio 2 diff --git a/ionic/config/config.ts b/ionic/config/config.ts index feacb0b063..c47f0505ba 100644 --- a/ionic/config/config.ts +++ b/ionic/config/config.ts @@ -78,8 +78,8 @@ import {isObject, isDefined, isFunction, isArray, extend} from '../util/util'; * | activator | highlight | ripple | * | actionSheetEnter | action-sheet-slide-in | action-sheet-md-slide-in | * | actionSheetLeave | action-sheet-slide-out | action-sheet-md-slide-out | - * | actionSheetCancelIcon | | ion-md-close | - * | actionSheetDestructiveIcon | | ion-md-trash | + * | alertEnter | alert-pop-in | alert-md-pop-in | + * | alertLeave | alert-pop-out | alert-md-pop-out | * | backButtonText | Back | | * | backButtonIcon | ion-ios-arrow-back | ion-md-arrow-back | * | iconMode | ios | md | @@ -88,8 +88,6 @@ import {isObject, isDefined, isFunction, isArray, extend} from '../util/util'; * | modalLeave | modal-slide-out | modal-md-slide-out | * | pageTransition | ios-transition | md-transition | * | pageTransitionDelay | 16 | 120 | - * | popupEnter | popup-pop-in | popup-md-pop-in | - * | popupLeave | popup-pop-out | popup-md-pop-out | * | tabbarPlacement | bottom | top | * | tabbarHighlight | | top | * | tabSubPage | | true | diff --git a/ionic/config/modes.ts b/ionic/config/modes.ts index 6524039bf8..fa88ace5f3 100644 --- a/ionic/config/modes.ts +++ b/ionic/config/modes.ts @@ -8,8 +8,6 @@ Config.setModeConfig('ios', { actionSheetEnter: 'action-sheet-slide-in', actionSheetLeave: 'action-sheet-slide-out', - actionSheetCancelIcon: '', - actionSheetDestructiveIcon: '', alertEnter: 'alert-pop-in', alertLeave: 'alert-pop-out', @@ -37,8 +35,6 @@ Config.setModeConfig('md', { actionSheetEnter: 'action-sheet-md-slide-in', actionSheetLeave: 'action-sheet-md-slide-out', - actionSheetCancelIcon: 'ion-md-close', - actionSheetDestructiveIcon: 'ion-md-trash', alertEnter: 'alert-md-pop-in', alertLeave: 'alert-md-pop-out',