diff --git a/ionic/components/blur/blur.ts b/ionic/components/blur/blur.ts index 6a58f4b1dd..d70e3cccce 100644 --- a/ionic/components/blur/blur.ts +++ b/ionic/components/blur/blur.ts @@ -2,9 +2,18 @@ import {Directive, Renderer, ElementRef} from 'angular2/core'; /** + * @name Blur + * @description * The blur attribute applies the CSS blur attribute to an element. If the CSS attribute is not supported, * it will fall back to applying a semi-transparent background color to the element. * + * @usage + * ```html + * + * This card will blur the content behind it. + * + * ``` + * * @demo /docs/v2/demos/blur/ */ @Directive({ diff --git a/ionic/config/config.ts b/ionic/config/config.ts index 1fab9f7e48..a3e0b26c45 100644 --- a/ionic/config/config.ts +++ b/ionic/config/config.ts @@ -60,46 +60,27 @@ import {isObject, isDefined, isFunction, isArray, extend} from '../util/util'; * * A config value can come from anywhere and be anything, but there are a default set of values. * - * ``` javascript - * // iOS - * activator: 'highlight', - * actionSheetEnter: 'action-sheet-slide-in', - * actionSheetLeave: 'action-sheet-slide-out', - * actionSheetCancelIcon: '', - * actionSheetDestructiveIcon: '', - * backButtonText: 'Back', - * backButtonIcon: 'ion-ios-arrow-back', - * iconMode: 'ios', - * menuType: 'reveal', - * modalEnter: 'modal-slide-in', - * modalLeave: 'modal-slide-out', - * pageTransition: 'ios-transition', - * pageTransitionDelay: 16, - * popupEnter: 'popup-pop-in', - * popupLeave: 'popup-pop-out', - * tabbarPlacement: 'bottom', - - * // MD - * activator: 'ripple', - * actionSheetEnter: 'action-sheet-md-slide-in', - * actionSheetLeave: 'action-sheet-md-slide-out', - * actionSheetCancelIcon: 'ion-md-close', - * actionSheetDestructiveIcon: 'ion-md-trash', - * backButtonText: '', - * backButtonIcon: 'ion-md-arrow-back', - * iconMode: 'md', - * menuType: 'overlay', - * modalEnter: 'modal-md-slide-in', - * modalLeave: 'modal-md-slide-out', - * pageTransition: 'md-transition', - * pageTransitionDelay: 120, - * popupEnter: 'popup-md-pop-in', - * popupLeave: 'popup-md-pop-out', - * tabbarHighlight: true, - * tabbarPlacement: 'top', - * tabSubPages: true, - * ``` * + * | Config property | Default iOS Value | Default MD Value | + * |----------------------------|------------------------|---------------------------| + * | 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 | + * | backButtonText | Back | | + * | backButtonIcon | ion-ios-arrow-back | ion-md-arrow-back | + * | iconMode | ios | md | + * | menuType | reveal | overlay | + * | modalEnter | modal-slide-in | modal-md-slide-in | + * | 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 | true | + * | tabbarHighlight | | top | + * | tabSubPage | | true | * **/ export class Config {