From d5ebf3ff5ea9fa4ff7f164503e0a9f240fff5690 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 26 Feb 2016 16:57:55 -0500 Subject: [PATCH] refactor(alert): remove duplicated styles from imports closes #5624 --- ionic/components/alert/alert.ios.scss | 25 +++++++------- ionic/components/alert/alert.md.scss | 48 +++++++++++++-------------- 2 files changed, 36 insertions(+), 37 deletions(-) diff --git a/ionic/components/alert/alert.ios.scss b/ionic/components/alert/alert.ios.scss index b37b5a622b..09c74cd96b 100644 --- a/ionic/components/alert/alert.ios.scss +++ b/ionic/components/alert/alert.ios.scss @@ -1,6 +1,5 @@ @import "../../globals.ios"; @import "./alert"; -@import "../checkbox/checkbox.ios"; // iOS Alerts // -------------------------------------------------- @@ -38,17 +37,17 @@ $alert-ios-button-border-radius: 0 !default; $alert-ios-button-border-color: #dbdbdf !default; $alert-ios-button-activated-background-color: #e9e9e9 !default; -$alert-checkbox-ios-icon-size: $checkbox-ios-icon-size !default; -$alert-checkbox-ios-icon-border-radius: $checkbox-ios-icon-border-radius !default; -$alert-checkbox-ios-icon-border-width: $checkbox-ios-icon-border-width !default; -$alert-checkbox-ios-icon-border-style: $checkbox-ios-icon-border-style !default; -$alert-checkbox-ios-icon-border-color-off: $checkbox-ios-icon-border-color-off !default; -$alert-checkbox-ios-icon-border-color-on: $checkbox-ios-icon-border-color-on !default; -$alert-checkbox-ios-background-color-off: $checkbox-ios-background-color-off !default; -$alert-checkbox-ios-background-color-on: $checkbox-ios-background-color-on !default; -$alert-checkbox-ios-icon-checkmark-width: $checkbox-ios-icon-checkmark-width !default; -$alert-checkbox-ios-icon-checkmark-style: $checkbox-ios-icon-checkmark-style !default; -$alert-checkbox-ios-icon-checkmark-color: $checkbox-ios-icon-checkmark-color !default; +$alert-checkbox-ios-icon-size: 21px !default; +$alert-checkbox-ios-icon-border-radius: 50% !default; +$alert-checkbox-ios-icon-border-width: 1px !default; +$alert-checkbox-ios-icon-border-style: solid !default; +$alert-checkbox-ios-icon-border-color-off: $list-ios-border-color !default; +$alert-checkbox-ios-icon-border-color-on: map-get($colors-ios, primary) !default; +$alert-checkbox-ios-background-color-off: $list-ios-background-color !default; +$alert-checkbox-ios-background-color-on: map-get($colors-ios, primary) !default; +$alert-checkbox-ios-icon-checkmark-width: $alert-checkbox-ios-icon-border-width !default; +$alert-checkbox-ios-icon-checkmark-style: $alert-checkbox-ios-icon-border-style !default; +$alert-checkbox-ios-icon-checkmark-color: $background-ios-color !default; ion-alert { @@ -96,7 +95,7 @@ ion-alert { .alert-message { max-height: 240px; - + &:empty { padding: 0 0 12px 0; } diff --git a/ionic/components/alert/alert.md.scss b/ionic/components/alert/alert.md.scss index 169b9716b0..4f00a8c341 100644 --- a/ionic/components/alert/alert.md.scss +++ b/ionic/components/alert/alert.md.scss @@ -1,36 +1,36 @@ @import "../../globals.md"; @import "./alert"; -@import "../button/button.md"; // Material Design Alerts // -------------------------------------------------- -$alert-md-max-width: 280px !default; -$alert-md-border-radius: 2px !default; -$alert-md-background-color: #fafafa !default; -$alert-md-box-shadow: 0px 16px 20px rgba(0, 0, 0, 0.4) !default; +$alert-md-max-width: 280px !default; +$alert-md-border-radius: 2px !default; +$alert-md-background-color: #fafafa !default; +$alert-md-box-shadow: 0px 16px 20px rgba(0, 0, 0, 0.4) !default; -$alert-md-head-text-align: left !default; -$alert-md-head-padding: 24px 24px 20px 24px !default; +$alert-md-head-text-align: left !default; +$alert-md-head-padding: 24px 24px 20px 24px !default; -$alert-md-title-font-size: 22px !default; -$alert-md-sub-title-font-size: 16px !default; +$alert-md-title-font-size: 22px !default; +$alert-md-sub-title-font-size: 16px !default; -$alert-md-message-font-size: 15px !default; -$alert-md-message-padding: 0 24px 24px 24px !default; -$alert-md-message-text-color: rgba(0,0,0,.5) !default; +$alert-md-message-font-size: 15px !default; +$alert-md-message-padding: 0 24px 24px 24px !default; +$alert-md-message-text-color: rgba(0,0,0,.5) !default; -$alert-md-input-border-color: #dedede !default; -$alert-md-input-text-color: #000000 !default; -$alert-md-input-highlight-color: map-get($colors-md, primary) !default; -$alert-md-input-margin-top: 5px !default; -$alert-md-input-margin-bottom: 5px !default; +$alert-md-input-border-color: #dedede !default; +$alert-md-input-text-color: #000000 !default; +$alert-md-input-highlight-color: map-get($colors-md, primary) !default; +$alert-md-input-margin-top: 5px !default; +$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; +$alert-md-button-text-color: map-get($colors-md, primary) !default; +$alert-md-button-background-color: transparent !default; +$alert-md-button-background-color-activated: rgba(158, 158, 158, 0.2) !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; .alert-wrapper { @@ -69,7 +69,7 @@ $alert-md-buttons-justify-content: flex-end !default; .alert-message { font-size: $alert-md-message-font-size; - max-height: 240px; + max-height: 240px; &:empty { padding: 0; @@ -232,7 +232,7 @@ $alert-md-buttons-justify-content: flex-end !default; text-align: right; &.activated { - background-color: $button-md-clear-active-background-color; + background-color: $alert-md-button-background-color-activated; opacity: 1; } }