diff --git a/ionic/components/popup/modes/md.scss b/ionic/components/popup/modes/md.scss index c54d6d6bfc..6c2c9a65a7 100644 --- a/ionic/components/popup/modes/md.scss +++ b/ionic/components/popup/modes/md.scss @@ -3,7 +3,6 @@ // -------------------------------------------------- $popup-md-max-width: 280px !default; -$popup-md-background: rgba(0,0,0,0.5) !default; $popup-md-border-radius: 2px !default; $popup-md-background-color: #fafafa !default; $popup-md-box-shadow: 0px 16px 20px rgba(0, 0, 0, 0.4) !default; @@ -24,8 +23,6 @@ $popup-md-prompt-input-margin-bottom: 5px !default; ion-popup { - background: $popup-md-background; - popup-wrapper { max-width: $popup-md-max-width; border-radius: $popup-md-border-radius; diff --git a/ionic/components/popup/popup.ts b/ionic/components/popup/popup.ts index b48bca4d5e..7ddd6afbbc 100644 --- a/ionic/components/popup/popup.ts +++ b/ionic/components/popup/popup.ts @@ -4,7 +4,6 @@ import {FORM_DIRECTIVES, NgControl, NgControlGroup, import {Overlay} from '../overlay/overlay'; import {Animation} from '../../animations/animation'; import {Ion} from '../ion'; -import {IonInput} from '../form/input'; import * as util from 'ionic/util'; @@ -58,9 +57,10 @@ export class Popup extends Overlay { */ popup(context, opts={}) { return new Promise((resolve, reject)=> { + let config = this.config; let defaults = { - enterAnimation: 'popup-pop-in', - leaveAnimation: 'popup-pop-out', + enterAnimation: config.setting('popupPopIn'), + leaveAnimation: config.setting('popupPopOut'), }; context.promiseResolve = resolve; @@ -204,7 +204,7 @@ const OVERLAY_TYPE = 'popup'; '' + '' + '' + '