Skip to content

Commit

Permalink
refactor(alert): remove duplicated styles from imports
Browse files Browse the repository at this point in the history 
closes #5624
  • Loading branch information
@brandyscarney
brandyscarney committed Feb 26, 2016
1 parent 8cfebe1 commit d5ebf3f
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 37 deletions.
25 changes: 12 additions & 13 deletions ionic/components/alert/alert.ios.scss
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
@import "../../globals.ios";
@import "./alert";
@import "../checkbox/checkbox.ios";

// iOS Alerts
// --------------------------------------------------
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -96,7 +95,7 @@ ion-alert {

.alert-message {
max-height: 240px;

&:empty {
padding: 0 0 12px 0;
}
Expand Down
48 changes: 24 additions & 24 deletions ionic/components/alert/alert.md.scss
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
}
}

0 comments on commit d5ebf3f

Please sign in to comment.