diff --git a/packages/core/src/components/alert/alert.ios.scss b/packages/core/src/components/alert/alert.ios.scss index 30fea57ae5..490dff7375 100644 --- a/packages/core/src/components/alert/alert.ios.scss +++ b/packages/core/src/components/alert/alert.ios.scss @@ -6,6 +6,7 @@ .alert-ios { font-family: $alert-ios-font-family; + font-size: $alert-ios-font-size; } .alert-ios .alert-wrapper { diff --git a/packages/core/src/components/alert/alert.ios.vars.scss b/packages/core/src/components/alert/alert.ios.vars.scss index 18b9ffe229..45152d1c00 100644 --- a/packages/core/src/components/alert/alert.ios.vars.scss +++ b/packages/core/src/components/alert/alert.ios.vars.scss @@ -8,6 +8,9 @@ /// @prop - Font family of the alert $alert-ios-font-family: $font-family-ios-base !default; +/// @prop - Font size of the alert +$alert-ios-font-size: $font-size-ios-base !default; + /// @prop - Max width of the alert $alert-ios-max-width: 270px !default; diff --git a/packages/core/src/components/alert/alert.md.scss b/packages/core/src/components/alert/alert.md.scss index 91aa3460a7..946581afc7 100644 --- a/packages/core/src/components/alert/alert.md.scss +++ b/packages/core/src/components/alert/alert.md.scss @@ -6,6 +6,7 @@ .alert-md { font-family: $alert-md-font-family; + font-size: $alert-md-font-size; } .alert-md .alert-wrapper { @@ -29,6 +30,7 @@ .alert-md .alert-title { font-size: $alert-md-title-font-size; + font-weight: $alert-md-title-font-weight; } .alert-md .alert-sub-title { @@ -264,6 +266,6 @@ background-color: $alert-md-button-background-color-activated; } -.alert-md .alert-button .button-inner { +.alert-md .alert-button-inner { justify-content: $alert-md-button-group-justify-content; } diff --git a/packages/core/src/components/alert/alert.md.vars.scss b/packages/core/src/components/alert/alert.md.vars.scss index b7b11d86bb..53b1a0cccb 100644 --- a/packages/core/src/components/alert/alert.md.vars.scss +++ b/packages/core/src/components/alert/alert.md.vars.scss @@ -8,6 +8,9 @@ /// @prop - Font family of the alert $alert-md-font-family: $font-family-md-base !default; +/// @prop - Font size of the alert +$alert-md-font-size: $font-size-md-base !default; + /// @prop - Max width of the alert $alert-md-max-width: 280px !default; @@ -41,6 +44,9 @@ $alert-md-head-text-align: start !default; /// @prop - Font size of the alert title $alert-md-title-font-size: 22px !default; +/// @prop - Font weight of the alert title +$alert-md-title-font-weight: 500 !default; + /// @prop - Font size of the alert sub title $alert-md-sub-title-font-size: 16px !default; diff --git a/packages/core/src/components/alert/alert.scss b/packages/core/src/components/alert/alert.scss index 4124a88882..5dfcf53866 100644 --- a/packages/core/src/components/alert/alert.scss +++ b/packages/core/src/components/alert/alert.scss @@ -16,6 +16,9 @@ ion-alert { justify-content: center; contain: strict; + + font-smoothing: antialiased; + -webkit-font-smoothing: antialiased; } ion-alert.alert-top { @@ -24,10 +27,6 @@ ion-alert.alert-top { align-items: flex-start; } -ion-alert input { - width: 100%; -} - .alert-wrapper { z-index: $z-index-overlay-wrapper; display: flex; @@ -58,13 +57,21 @@ ion-alert input { overflow-y: scroll; -webkit-overflow-scrolling: touch; + + box-sizing: border-box; } .alert-input { @include padding(10px, 0); + width: 100%; + border: 0; background: inherit; + + font: inherit; + + box-sizing: border-box; } .alert-button-group { @@ -92,12 +99,26 @@ ion-alert input { line-height: $alert-button-line-height; } +.alert-button-inner { + display: flex; + + flex-flow: row nowrap; + flex-shrink: 0; + align-items: center; + justify-content: center; + + width: 100%; + height: 100%; +} + .alert-tappable { @include text-align(start); @include appearance(none); @include margin(0); @include padding(0); + border: 0; + width: 100%; font-size: inherit; @@ -115,3 +136,9 @@ ion-alert input { outline: none; } } + +.alert-radio-icon, +.alert-checkbox-icon, +.alert-checkbox-inner { + box-sizing: border-box; +} \ No newline at end of file diff --git a/packages/core/src/components/alert/alert.tsx b/packages/core/src/components/alert/alert.tsx index 7cdbbda727..2eb6fa6ae2 100644 --- a/packages/core/src/components/alert/alert.tsx +++ b/packages/core/src/components/alert/alert.tsx @@ -293,7 +293,7 @@ export class Alert {