From 5b0d60d4a2bb0a89e6f3268ceaf068415ce654f7 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Tue, 26 Jan 2016 14:32:08 -0500 Subject: [PATCH] fix(alert): add z-index and border-radius to fix ripple copy button css to fix the border on ripple closes #5203 --- ionic/components/alert/alert.ios.scss | 3 ++- ionic/components/alert/alert.md.scss | 2 ++ ionic/components/alert/alert.scss | 1 + 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ionic/components/alert/alert.ios.scss b/ionic/components/alert/alert.ios.scss index 6015b4f9ca..0f0a1aaa53 100644 --- a/ionic/components/alert/alert.ios.scss +++ b/ionic/components/alert/alert.ios.scss @@ -33,6 +33,7 @@ $alert-ios-button-min-height: 44px !default; $alert-ios-button-font-size: 17px !default; $alert-ios-button-text-color: map-get($colors-ios, primary) !default; $alert-ios-button-background-color: transparent !default; +$alert-ios-button-border-radius: 0 !default; $alert-ios-button-border-color: #c8c7cc !default; $alert-ios-button-activated-background-color: #e9e9e9 !default; @@ -172,7 +173,7 @@ ion-alert { flex: 1; font-size: $alert-ios-button-font-size; min-height: $alert-ios-button-min-height; - border-radius: 0; + border-radius: $alert-ios-button-border-radius; border-top: 1px solid $alert-ios-button-border-color; border-right: 1px solid $alert-ios-button-border-color; color: $alert-ios-button-text-color; diff --git a/ionic/components/alert/alert.md.scss b/ionic/components/alert/alert.md.scss index 831e765296..d4f504aaa0 100644 --- a/ionic/components/alert/alert.md.scss +++ b/ionic/components/alert/alert.md.scss @@ -27,6 +27,7 @@ $alert-md-input-margin-bottom: 5px !default; $alert-md-button-text-color: map-get($colors-md, primary) !default; $alert-md-button-background-color: transparent !default; +$alert-md-button-border-radius: 2px !default; $alert-md-buttons-padding: 8px 8px 8px 24px !default; $alert-md-buttons-justify-content: flex-end !default; @@ -219,6 +220,7 @@ $alert-md-buttons-justify-content: flex-end !default; font-weight: 500; color: $alert-md-button-text-color; background-color: $alert-md-button-background-color; + border-radius: $alert-md-button-border-radius; text-transform: uppercase; &.activated { diff --git a/ionic/components/alert/alert.scss b/ionic/components/alert/alert.scss index c1c179b956..b775338754 100644 --- a/ionic/components/alert/alert.scss +++ b/ionic/components/alert/alert.scss @@ -74,6 +74,7 @@ ion-alert { .alert-button { display: block; margin: 0; + z-index: 0; line-height: $alert-button-line-height; font-size: $alert-button-font-size; margin-right: $alert-button-margin-right;