From aae4648430dbd5c0778eacd6012944beab05d783 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 21 Jul 2015 12:53:48 -0500 Subject: [PATCH] POpup stuff --- ionic/components/popup/extensions/ios.scss | 12 ++++++++++- ionic/components/popup/popup.scss | 24 +--------------------- 2 files changed, 12 insertions(+), 24 deletions(-) diff --git a/ionic/components/popup/extensions/ios.scss b/ionic/components/popup/extensions/ios.scss index ed7ce4bbe2..71a339521f 100644 --- a/ionic/components/popup/extensions/ios.scss +++ b/ionic/components/popup/extensions/ios.scss @@ -1,14 +1,24 @@ -$popup-ios-border-radius: 4px !default; +$popup-ios-border-radius: 13px !default; +$popup-ios-bg-color: #f8f8f8 !default; .popup[mode="ios"] { + .popup-wrapper { + border-radius: $popup-ios-border-radius; + background-color: $popup-ios-bg-color; + + .popup-title { + } + .popup-body:empty { padding: 0; } .popup-buttons { padding: 0; min-height: 0; .button { + min-height: 36px; color: get-color('primary', base); + font-size: 14px; } } } diff --git a/ionic/components/popup/popup.scss b/ionic/components/popup/popup.scss index 7d5ef6e861..3ea253bad9 100644 --- a/ionic/components/popup/popup.scss +++ b/ionic/components/popup/popup.scss @@ -50,28 +50,6 @@ ion-popup { z-index: $z-index-overlay; - // Start hidden - //visibility: hidden; - /* - &.popup-showing { - visibility: visible; - } - - &.popup-hidden .popup { - @include animation-name(scaleOut); - @include animation-duration($popup-leave-animation-duration); - @include animation-timing-function(ease-in-out); - @include animation-fill-mode(both); - } - - &.active .popup { - @include animation-name(superScaleIn); - @include animation-duration($popup-enter-animation-duration); - @include animation-timing-function(ease-in-out); - @include animation-fill-mode(both); - } - */ - .popup-wrapper { z-index: $z-index-popup-wrapper; width: $popup-width; @@ -96,7 +74,7 @@ ion-popup { border-bottom: 1px solid #eee; text-align: center; } -.popup-title { +h3.popup-title { margin: 0; padding: 0; font-size: 15px;