Skip to content

Commit

Permalink
fix(sass): add missing alert css properties (#14269)
Browse files Browse the repository at this point in the history
fixes #14258
  • Loading branch information
aphex authored and brandyscarney committed Apr 4, 2018
1 parent 57fbf6c commit 3471dd6
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 1 deletion.
1 change: 1 addition & 0 deletions core/src/components/alert/alert.ios.scss
Expand Up @@ -44,6 +44,7 @@
.alert-ios .alert-title {
@include margin($alert-ios-title-margin-top, null, null, null);

color: $alert-ios-title-color;
font-size: $alert-ios-title-font-size;
font-weight: $alert-ios-title-font-weight;
}
Expand Down
5 changes: 4 additions & 1 deletion core/src/components/alert/alert.ios.vars.scss
Expand Up @@ -44,6 +44,9 @@ $alert-ios-head-padding-start: $alert-ios-head-padding-
/// @prop - Text align of the alert head
$alert-ios-head-text-align: center !default;

/// @prop - Color of the alert title
$alert-ios-title-color: $text-ios-color !default;

/// @prop - Margin top of the alert title
$alert-ios-title-margin-top: 8px !default;

Expand Down Expand Up @@ -78,7 +81,7 @@ $alert-ios-message-font-size: 13px !default;
$alert-ios-message-text-align: center !default;

/// @prop - Text color of the alert message
$alert-ios-message-text-color: inherit !default;
$alert-ios-message-text-color: $text-ios-color !default;

/// @prop - Padding top of the alert empty message
$alert-ios-message-empty-padding-top: 0 !default;
Expand Down
2 changes: 2 additions & 0 deletions core/src/components/alert/alert.md.scss
Expand Up @@ -29,11 +29,13 @@
}

.alert-md .alert-title {
color: $alert-md-title-color;
font-size: $alert-md-title-font-size;
font-weight: $alert-md-title-font-weight;
}

.alert-md .alert-sub-title {
color: $alert-md-sub-title-text-color;
font-size: $alert-md-sub-title-font-size;
}

Expand Down
6 changes: 6 additions & 0 deletions core/src/components/alert/alert.md.vars.scss
Expand Up @@ -41,6 +41,9 @@ $alert-md-head-padding-start: $alert-md-head-padding-end !defaul
/// @prop - Text align of the alert head
$alert-md-head-text-align: start !default;

/// @prop - Color of the alert title
$alert-md-title-color: $text-md-color !default;

/// @prop - Font size of the alert title
$alert-md-title-font-size: 20px !default;

Expand All @@ -50,6 +53,9 @@ $alert-md-title-font-weight: 500 !default;
/// @prop - Font size of the alert sub title
$alert-md-sub-title-font-size: 16px !default;

/// @prop - Text color of the alert sub title
$alert-md-sub-title-text-color: $text-md-color !default;

/// @prop - Padding top of the alert message
$alert-md-message-padding-top: 0 !default;

Expand Down

0 comments on commit 3471dd6

Please sign in to comment.