From d12ef78de63589bf756e95e3c65e40821860ffb0 Mon Sep 17 00:00:00 2001 From: "Manu Mtz.-Almeida" Date: Fri, 24 Aug 2018 03:33:44 +0200 Subject: [PATCH] refactor(all): cleanup mode font --- .../action-sheet/action-sheet.ios.scss | 2 -- .../action-sheet/action-sheet.ios.vars.scss | 3 --- .../action-sheet/action-sheet.md.scss | 7 ------ .../action-sheet/action-sheet.md.vars.scss | 3 --- .../components/action-sheet/action-sheet.scss | 2 ++ core/src/components/alert/alert.ios.scss | 1 - core/src/components/alert/alert.ios.vars.scss | 3 --- core/src/components/alert/alert.md.scss | 1 - core/src/components/alert/alert.md.vars.scss | 3 --- core/src/components/alert/alert.scss | 2 ++ core/src/components/badge/badge.ios.scss | 2 -- core/src/components/badge/badge.ios.vars.scss | 3 --- core/src/components/badge/badge.md.scss | 2 -- core/src/components/badge/badge.md.vars.scss | 3 --- core/src/components/badge/badge.scss | 1 + core/src/components/button/button.ios.scss | 1 - .../components/button/button.ios.vars.scss | 3 --- core/src/components/button/button.md.scss | 1 - .../src/components/button/button.md.vars.scss | 3 --- core/src/components/button/button.scss | 2 ++ .../components/buttons/buttons.ios.vars.scss | 3 --- .../components/buttons/buttons.md.vars.scss | 3 --- core/src/components/card/card.ios.scss | 1 - core/src/components/card/card.ios.vars.scss | 3 --- core/src/components/card/card.md.scss | 1 - core/src/components/card/card.md.vars.scss | 3 --- core/src/components/card/card.scss | 2 ++ core/src/components/chip/chip.ios.scss | 1 - core/src/components/chip/chip.ios.vars.scss | 3 --- core/src/components/chip/chip.md.scss | 1 - core/src/components/chip/chip.md.vars.scss | 3 --- core/src/components/chip/chip.scss | 1 + core/src/components/content/readme.md | 24 +++++++++---------- .../src/components/datetime/datetime.ios.scss | 2 -- .../datetime/datetime.ios.vars.scss | 3 --- core/src/components/datetime/datetime.md.scss | 2 -- .../components/datetime/datetime.md.vars.scss | 3 --- core/src/components/datetime/datetime.scss | 2 ++ core/src/components/input/input.ios.scss | 1 - core/src/components/input/input.ios.vars.scss | 3 --- core/src/components/input/input.md.scss | 1 - core/src/components/input/input.md.vars.scss | 3 --- core/src/components/input/input.scss | 2 ++ .../item-divider/item-divider.ios.scss | 1 - .../item-divider/item-divider.ios.vars.scss | 3 --- .../item-divider/item-divider.md.scss | 1 - .../item-divider/item-divider.md.vars.scss | 3 --- .../components/item-divider/item-divider.scss | 2 ++ .../components/item-option/item-option.scss | 2 ++ core/src/components/item/item.ios.scss | 1 - core/src/components/item/item.ios.vars.scss | 3 --- core/src/components/item/item.md.scss | 1 - core/src/components/item/item.md.vars.scss | 3 --- core/src/components/item/item.scss | 2 ++ core/src/components/label/label.ios.scss | 2 -- core/src/components/label/label.ios.vars.scss | 3 --- core/src/components/label/label.md.scss | 2 -- core/src/components/label/label.md.vars.scss | 3 --- core/src/components/label/label.scss | 1 + core/src/components/loading/loading.ios.scss | 1 - .../components/loading/loading.ios.vars.scss | 3 --- core/src/components/loading/loading.md.scss | 1 - .../components/loading/loading.md.vars.scss | 3 --- core/src/components/loading/loading.scss | 2 ++ core/src/components/note/note.ios.scss | 2 -- core/src/components/note/note.ios.vars.scss | 3 --- core/src/components/note/note.md.scss | 2 -- core/src/components/note/note.md.vars.scss | 3 --- core/src/components/note/note.scss | 2 ++ core/src/components/picker/picker.ios.scss | 4 ---- .../components/picker/picker.ios.vars.scss | 3 --- core/src/components/picker/picker.md.scss | 4 ---- .../src/components/picker/picker.md.vars.scss | 3 --- core/src/components/picker/picker.scss | 2 ++ core/src/components/range/range.ios.scss | 2 -- core/src/components/range/range.ios.vars.scss | 3 --- core/src/components/range/range.md.scss | 1 - core/src/components/range/range.md.vars.scss | 3 --- core/src/components/range/range.scss | 2 ++ .../components/searchbar/searchbar.ios.scss | 2 -- .../searchbar/searchbar.ios.vars.scss | 3 --- .../components/searchbar/searchbar.md.scss | 2 -- .../searchbar/searchbar.md.vars.scss | 3 --- core/src/components/searchbar/searchbar.scss | 2 ++ core/src/components/segment/segment.ios.scss | 2 -- .../components/segment/segment.ios.vars.scss | 3 --- core/src/components/segment/segment.md.scss | 2 -- .../components/segment/segment.md.vars.scss | 3 --- core/src/components/segment/segment.scss | 2 ++ core/src/components/select/select.ios.scss | 4 ---- .../components/select/select.ios.vars.scss | 3 --- core/src/components/select/select.md.scss | 4 ---- .../src/components/select/select.md.vars.scss | 3 --- core/src/components/select/select.scss | 4 ++++ .../src/components/textarea/textarea.ios.scss | 1 - .../textarea/textarea.ios.vars.scss | 3 --- core/src/components/textarea/textarea.md.scss | 1 - .../components/textarea/textarea.md.vars.scss | 3 --- core/src/components/textarea/textarea.scss | 2 ++ core/src/components/toast/toast.ios.scss | 1 - core/src/components/toast/toast.ios.vars.scss | 3 --- core/src/components/toast/toast.md.scss | 1 - core/src/components/toast/toast.md.vars.scss | 3 --- core/src/components/toast/toast.scss | 2 ++ core/src/components/toolbar/toolbar.ios.scss | 2 -- .../components/toolbar/toolbar.ios.vars.scss | 3 --- core/src/components/toolbar/toolbar.md.scss | 2 -- .../components/toolbar/toolbar.md.vars.scss | 3 --- core/src/components/toolbar/toolbar.scss | 2 ++ 109 files changed, 54 insertions(+), 221 deletions(-) diff --git a/core/src/components/action-sheet/action-sheet.ios.scss b/core/src/components/action-sheet/action-sheet.ios.scss index 400836fb40..d45b81f080 100644 --- a/core/src/components/action-sheet/action-sheet.ios.scss +++ b/core/src/components/action-sheet/action-sheet.ios.scss @@ -5,8 +5,6 @@ // -------------------------------------------------- :host { - font-family: $action-sheet-ios-font-family; - text-align: $action-sheet-ios-text-align; } diff --git a/core/src/components/action-sheet/action-sheet.ios.vars.scss b/core/src/components/action-sheet/action-sheet.ios.vars.scss index 6fb4d73494..87de0419a8 100644 --- a/core/src/components/action-sheet/action-sheet.ios.vars.scss +++ b/core/src/components/action-sheet/action-sheet.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Action Sheet // -------------------------------------------------- -/// @prop - Font family of the action sheet -$action-sheet-ios-font-family: $font-family-base !default; - /// @prop - Text align of the action sheet $action-sheet-ios-text-align: center !default; diff --git a/core/src/components/action-sheet/action-sheet.md.scss b/core/src/components/action-sheet/action-sheet.md.scss index 0e83db55fe..00f6102a1b 100644 --- a/core/src/components/action-sheet/action-sheet.md.scss +++ b/core/src/components/action-sheet/action-sheet.md.scss @@ -1,13 +1,6 @@ @import "./action-sheet"; @import "./action-sheet.md.vars"; -// Material Design Action Sheet -// -------------------------------------------------- - -:host { - font-family: $action-sheet-md-font-family; -} - // Material Design Action Sheet Title // ----------------------------------------- diff --git a/core/src/components/action-sheet/action-sheet.md.vars.scss b/core/src/components/action-sheet/action-sheet.md.vars.scss index d413d4c0f3..1ef2652661 100644 --- a/core/src/components/action-sheet/action-sheet.md.vars.scss +++ b/core/src/components/action-sheet/action-sheet.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Action Sheet // -------------------------------------------------- -/// @prop - Font family of the action sheet -$action-sheet-md-font-family: $font-family-base !default; - /// @prop - Text align of the action sheet $action-sheet-md-text-align: start !default; diff --git a/core/src/components/action-sheet/action-sheet.scss b/core/src/components/action-sheet/action-sheet.scss index 1425e6b254..7324061713 100644 --- a/core/src/components/action-sheet/action-sheet.scss +++ b/core/src/components/action-sheet/action-sheet.scss @@ -13,6 +13,8 @@ display: block; position: fixed; + font-family: $font-family-base; + touch-action: none; user-select: none; z-index: $z-index-overlay; diff --git a/core/src/components/alert/alert.ios.scss b/core/src/components/alert/alert.ios.scss index c292f038b4..5030468dd3 100644 --- a/core/src/components/alert/alert.ios.scss +++ b/core/src/components/alert/alert.ios.scss @@ -8,7 +8,6 @@ --background: #{$alert-ios-background-color}; --max-width: #{$alert-ios-max-width}; - font-family: $alert-ios-font-family; font-size: $alert-ios-font-size; } diff --git a/core/src/components/alert/alert.ios.vars.scss b/core/src/components/alert/alert.ios.vars.scss index 222ba16f2e..0234fcd776 100644 --- a/core/src/components/alert/alert.ios.vars.scss +++ b/core/src/components/alert/alert.ios.vars.scss @@ -4,9 +4,6 @@ // iOS Alert // -------------------------------------------------- -/// @prop - Font family of the alert -$alert-ios-font-family: $font-family-base !default; - /// @prop - Font size of the alert $alert-ios-font-size: 14px !default; diff --git a/core/src/components/alert/alert.md.scss b/core/src/components/alert/alert.md.scss index 8d973028ca..bb6c868be5 100644 --- a/core/src/components/alert/alert.md.scss +++ b/core/src/components/alert/alert.md.scss @@ -8,7 +8,6 @@ --background: #{$alert-md-background-color}; --max-width: #{$alert-md-max-width}; - font-family: $alert-md-font-family; font-size: $alert-md-font-size; } diff --git a/core/src/components/alert/alert.md.vars.scss b/core/src/components/alert/alert.md.vars.scss index 25972d9456..14c55b616b 100644 --- a/core/src/components/alert/alert.md.vars.scss +++ b/core/src/components/alert/alert.md.vars.scss @@ -4,9 +4,6 @@ // Material Design Alert // -------------------------------------------------- -/// @prop - Font family of the alert -$alert-md-font-family: $font-family-base !default; - /// @prop - Font size of the alert $alert-md-font-size: 14px !default; diff --git a/core/src/components/alert/alert.scss b/core/src/components/alert/alert.scss index 4a1e5596e5..87d9e056e1 100644 --- a/core/src/components/alert/alert.scss +++ b/core/src/components/alert/alert.scss @@ -16,6 +16,8 @@ align-items: center; justify-content: center; + font-family: $font-family-base; + contain: strict; touch-action: none; user-select: none; diff --git a/core/src/components/badge/badge.ios.scss b/core/src/components/badge/badge.ios.scss index 2bb723a471..973acd9d6d 100644 --- a/core/src/components/badge/badge.ios.scss +++ b/core/src/components/badge/badge.ios.scss @@ -6,6 +6,4 @@ :host { @include border-radius($badge-ios-border-radius); - - font-family: $badge-ios-font-family; } diff --git a/core/src/components/badge/badge.ios.vars.scss b/core/src/components/badge/badge.ios.vars.scss index 78f0a01dbf..73dc0be8f7 100644 --- a/core/src/components/badge/badge.ios.vars.scss +++ b/core/src/components/badge/badge.ios.vars.scss @@ -5,6 +5,3 @@ /// @prop - Border radius of the badge $badge-ios-border-radius: 10px !default; - -/// @prop - Font family of the badge -$badge-ios-font-family: $font-family-base !default; diff --git a/core/src/components/badge/badge.md.scss b/core/src/components/badge/badge.md.scss index ca92bd4d16..e9e028ea85 100644 --- a/core/src/components/badge/badge.md.scss +++ b/core/src/components/badge/badge.md.scss @@ -6,6 +6,4 @@ :host { @include border-radius($badge-md-border-radius); - - font-family: $badge-md-font-family; } diff --git a/core/src/components/badge/badge.md.vars.scss b/core/src/components/badge/badge.md.vars.scss index b1f4044140..90516314ec 100644 --- a/core/src/components/badge/badge.md.vars.scss +++ b/core/src/components/badge/badge.md.vars.scss @@ -5,6 +5,3 @@ /// @prop - Border radius of the badge $badge-md-border-radius: 4px !default; - -/// @prop - Font family of the badge -$badge-md-font-family: $font-family-base !default; diff --git a/core/src/components/badge/badge.scss b/core/src/components/badge/badge.scss index aeffe43fdd..cb816ea9ce 100644 --- a/core/src/components/badge/badge.scss +++ b/core/src/components/badge/badge.scss @@ -30,6 +30,7 @@ background: var(--background); color: var(--color); + font-family: $font-family-base; font-size: $badge-font-size; font-weight: $badge-font-weight; diff --git a/core/src/components/button/button.ios.scss b/core/src/components/button/button.ios.scss index b57176d726..14c2da3471 100644 --- a/core/src/components/button/button.ios.scss +++ b/core/src/components/button/button.ios.scss @@ -18,7 +18,6 @@ --height: #{$button-ios-height}; --transition: background-color, opacity 100ms linear; - font-family: #{$button-ios-font-family}; font-size: #{$button-ios-font-size}; font-weight: #{$button-ios-font-weight}; diff --git a/core/src/components/button/button.ios.vars.scss b/core/src/components/button/button.ios.vars.scss index d1c17b8b33..c24040ea7e 100644 --- a/core/src/components/button/button.ios.vars.scss +++ b/core/src/components/button/button.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Button // -------------------------------------------------- -/// @prop - Font family of the button -$button-ios-font-family: $font-family-base !default; - /// @prop - Margin top of the button $button-ios-margin-top: 4px !default; diff --git a/core/src/components/button/button.md.scss b/core/src/components/button/button.md.scss index 05a3adc216..51007da795 100644 --- a/core/src/components/button/button.md.scss +++ b/core/src/components/button/button.md.scss @@ -19,7 +19,6 @@ --padding-end: #{$button-md-padding-end}; --height: #{$button-md-height}; - font-family: #{$button-md-font-family}; font-size: #{$button-md-font-size}; font-weight: #{$button-md-font-weight}; diff --git a/core/src/components/button/button.md.vars.scss b/core/src/components/button/button.md.vars.scss index 27a6c04f86..55159e178b 100644 --- a/core/src/components/button/button.md.vars.scss +++ b/core/src/components/button/button.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Button // -------------------------------------------------- -/// @prop - Font family of the button -$button-md-font-family: $font-family-base !default; - /// @prop - Margin top of the button $button-md-margin-top: 4px; diff --git a/core/src/components/button/button.scss b/core/src/components/button/button.scss index 8e3853bc74..646bc67390 100644 --- a/core/src/components/button/button.scss +++ b/core/src/components/button/button.scss @@ -12,6 +12,8 @@ display: inline-block; + font-family: $font-family-base; + text-align: center; text-decoration: none; text-overflow: ellipsis; diff --git a/core/src/components/buttons/buttons.ios.vars.scss b/core/src/components/buttons/buttons.ios.vars.scss index a6c3f86a4c..da03cf20fb 100644 --- a/core/src/components/buttons/buttons.ios.vars.scss +++ b/core/src/components/buttons/buttons.ios.vars.scss @@ -15,9 +15,6 @@ $toolbar-order-ios: ( menu-toggle-end: 7, ); -/// @prop - Font family of the toolbar -$toolbar-ios-font-family: $font-family-base !default; - /// @prop - Font size of the toolbar button $toolbar-ios-button-font-size: 17px !default; diff --git a/core/src/components/buttons/buttons.md.vars.scss b/core/src/components/buttons/buttons.md.vars.scss index d92b493474..e517e2a825 100644 --- a/core/src/components/buttons/buttons.md.vars.scss +++ b/core/src/components/buttons/buttons.md.vars.scss @@ -15,9 +15,6 @@ $toolbar-order-md: ( menu-toggle-end: 7, ); -/// @prop - Font family of the toolbar -$toolbar-md-font-family: $font-family-base !default; - /// @prop - Font size of the toolbar button $toolbar-md-button-font-size: 14px !default; diff --git a/core/src/components/card/card.ios.scss b/core/src/components/card/card.ios.scss index a701150cc2..d2665a2ccd 100755 --- a/core/src/components/card/card.ios.scss +++ b/core/src/components/card/card.ios.scss @@ -13,7 +13,6 @@ transform: translateZ(0); - font-family: $card-ios-font-family; font-size: $card-ios-font-size; box-shadow: $card-ios-box-shadow; diff --git a/core/src/components/card/card.ios.vars.scss b/core/src/components/card/card.ios.vars.scss index 63073fa753..ce1e143e2e 100755 --- a/core/src/components/card/card.ios.vars.scss +++ b/core/src/components/card/card.ios.vars.scss @@ -27,9 +27,6 @@ $card-ios-box-shadow: 0 4px 16px $card-ios-box-shadow-color !de /// @prop - Border radius of the card $card-ios-border-radius: 8px !default; -/// @prop - Font family of the card -$card-ios-font-family: $font-family-base !default; - /// @prop - Font size of the card $card-ios-font-size: 14px !default; diff --git a/core/src/components/card/card.md.scss b/core/src/components/card/card.md.scss index 885a24a768..d6742ef201 100755 --- a/core/src/components/card/card.md.scss +++ b/core/src/components/card/card.md.scss @@ -11,7 +11,6 @@ @include margin($card-md-margin-top, $card-md-margin-end, $card-md-margin-bottom, $card-md-margin-start); @include border-radius($card-md-border-radius); - font-family: $card-md-font-family; font-size: $card-md-font-size; box-shadow: $card-md-box-shadow; diff --git a/core/src/components/card/card.md.vars.scss b/core/src/components/card/card.md.vars.scss index 5d401a5f85..987d0ffea0 100755 --- a/core/src/components/card/card.md.vars.scss +++ b/core/src/components/card/card.md.vars.scss @@ -27,9 +27,6 @@ $card-md-border-radius: 2px !default; /// @prop - Font size of the card $card-md-font-size: 14px !default; -/// @prop - Font family of the card -$card-md-font-family: $font-family-base !default; - /// @prop - Line height of the card $card-md-line-height: 1.5 !default; diff --git a/core/src/components/card/card.scss b/core/src/components/card/card.scss index c00a60c158..d90465df0c 100755 --- a/core/src/components/card/card.scss +++ b/core/src/components/card/card.scss @@ -17,6 +17,8 @@ background: var(--background); color: var(--color); + font-family: $font-family-base; + overflow: hidden; } diff --git a/core/src/components/chip/chip.ios.scss b/core/src/components/chip/chip.ios.scss index ba3b5d291b..e7fcfaf50b 100644 --- a/core/src/components/chip/chip.ios.scss +++ b/core/src/components/chip/chip.ios.scss @@ -27,6 +27,5 @@ height: $chip-ios-height; - font-family: $chip-ios-font-family; font-size: $chip-ios-font-size; } diff --git a/core/src/components/chip/chip.ios.vars.scss b/core/src/components/chip/chip.ios.vars.scss index b38468b006..add99e9470 100644 --- a/core/src/components/chip/chip.ios.vars.scss +++ b/core/src/components/chip/chip.ios.vars.scss @@ -21,9 +21,6 @@ $chip-ios-height: 32px !default; /// @prop - Border radius of the chip $chip-ios-border-radius: 16px !default; -/// @prop - Font family of the chip -$chip-ios-font-family: $font-family-base !default; - /// @prop - Font size of the chip $chip-ios-font-size: 13px !default; diff --git a/core/src/components/chip/chip.md.scss b/core/src/components/chip/chip.md.scss index 5ce12f937f..5587b7ad87 100644 --- a/core/src/components/chip/chip.md.scss +++ b/core/src/components/chip/chip.md.scss @@ -27,6 +27,5 @@ height: $chip-md-height; - font-family: $chip-md-font-family; font-size: $chip-md-font-size; } diff --git a/core/src/components/chip/chip.md.vars.scss b/core/src/components/chip/chip.md.vars.scss index 86db6d2716..7195385525 100644 --- a/core/src/components/chip/chip.md.vars.scss +++ b/core/src/components/chip/chip.md.vars.scss @@ -21,9 +21,6 @@ $chip-md-height: 32px !default; /// @prop - Border radius of the chip $chip-md-border-radius: 16px !default; -/// @prop - Font family of the chip -$chip-md-font-family: $font-family-base !default; - /// @prop - Font size of the chip $chip-md-font-size: 13px !default; diff --git a/core/src/components/chip/chip.scss b/core/src/components/chip/chip.scss index 3f6ef8c1b0..87bd1ecaa6 100644 --- a/core/src/components/chip/chip.scss +++ b/core/src/components/chip/chip.scss @@ -31,6 +31,7 @@ background: var(--background); color: var(--color); + font-family: $font-family-base; font-weight: normal; vertical-align: middle; diff --git a/core/src/components/content/readme.md b/core/src/components/content/readme.md index e347015810..a9029e5981 100644 --- a/core/src/components/content/readme.md +++ b/core/src/components/content/readme.md @@ -41,19 +41,17 @@ view component. ## CSS Custom Properties -| Name | Description | -| ------------------- | ----------------------------------- | -| `--background` | Background of the Content | -| `--color` | Color of the Content | -| `--hr-background` | Background of the hr in the Content | -| `--hr-height` | Height of the hr in the Content | -| `--keyboard-offset` | Keyboard offset of the Content | -| `--offset-bottom` | Offset bottom of the Content | -| `--offset-top` | Offset top of the Content | -| `--padding-bottom` | Padding bottom of the Content | -| `--padding-end` | Padding end of the Content | -| `--padding-start` | Padding start of the Content | -| `--padding-top` | Padding top of the Content | +| Name | Description | +| ------------------- | ------------------------------ | +| `--background` | Background of the Content | +| `--color` | Color of the Content | +| `--keyboard-offset` | Keyboard offset of the Content | +| `--offset-bottom` | Offset bottom of the Content | +| `--offset-top` | Offset top of the Content | +| `--padding-bottom` | Padding bottom of the Content | +| `--padding-end` | Padding end of the Content | +| `--padding-start` | Padding start of the Content | +| `--padding-top` | Padding top of the Content | ---------------------------------------------- diff --git a/core/src/components/datetime/datetime.ios.scss b/core/src/components/datetime/datetime.ios.scss index df08c0e376..fe2728aa73 100644 --- a/core/src/components/datetime/datetime.ios.scss +++ b/core/src/components/datetime/datetime.ios.scss @@ -6,8 +6,6 @@ .datetime-ios { @include padding($datetime-ios-padding-top, $datetime-ios-padding-end, $datetime-ios-padding-bottom, $datetime-ios-padding-start); - - font-family: $datetime-ios-font-family; } .datetime-ios .datetime-placeholder { diff --git a/core/src/components/datetime/datetime.ios.vars.scss b/core/src/components/datetime/datetime.ios.vars.scss index e07aa0fd31..19af09fcba 100644 --- a/core/src/components/datetime/datetime.ios.vars.scss +++ b/core/src/components/datetime/datetime.ios.vars.scss @@ -16,8 +16,5 @@ $datetime-ios-padding-bottom: $item-ios-padding-bottom !default; /// @prop - Padding start of the datetime $datetime-ios-padding-start: $item-ios-padding-start !default; -/// @prop - Font family of the datetime -$datetime-ios-font-family: $font-family-base !default; - /// @prop - Color of the datetime placeholder $datetime-ios-placeholder-color: $text-color-step-600 !default; diff --git a/core/src/components/datetime/datetime.md.scss b/core/src/components/datetime/datetime.md.scss index 8956736b1e..284aa02a86 100644 --- a/core/src/components/datetime/datetime.md.scss +++ b/core/src/components/datetime/datetime.md.scss @@ -6,8 +6,6 @@ .datetime-md { @include padding($datetime-md-padding-top, $datetime-md-padding-end, $datetime-md-padding-bottom, $datetime-md-padding-start); - - font-family: $datetime-md-font-family; } .datetime-md .datetime-placeholder { diff --git a/core/src/components/datetime/datetime.md.vars.scss b/core/src/components/datetime/datetime.md.vars.scss index 8a7a9bb8f0..9743241cf6 100644 --- a/core/src/components/datetime/datetime.md.vars.scss +++ b/core/src/components/datetime/datetime.md.vars.scss @@ -16,8 +16,5 @@ $datetime-md-padding-bottom: $item-md-padding-bottom !default; /// @prop - Padding start of the datetime $datetime-md-padding-start: $item-md-padding-start !default; -/// @prop - Font family of the datetime -$datetime-md-font-family: $font-family-base !default; - /// @prop - Color of the datetime placeholder $datetime-md-placeholder-color: $placeholder-text-color !default; diff --git a/core/src/components/datetime/datetime.scss b/core/src/components/datetime/datetime.scss index 5fa2707d1a..f83b7fd00e 100644 --- a/core/src/components/datetime/datetime.scss +++ b/core/src/components/datetime/datetime.scss @@ -7,6 +7,8 @@ ion-datetime { display: flex; position: relative; + font-family: $font-family-base; + overflow: hidden; } diff --git a/core/src/components/input/input.ios.scss b/core/src/components/input/input.ios.scss index 06b0690068..d11c978709 100644 --- a/core/src/components/input/input.ios.scss +++ b/core/src/components/input/input.ios.scss @@ -7,7 +7,6 @@ --padding-bottom: #{$input-ios-padding-bottom}; --padding-start: #{$input-ios-padding-start}; - font-family: $input-ios-font-family; font-size: $input-ios-font-size; } diff --git a/core/src/components/input/input.ios.vars.scss b/core/src/components/input/input.ios.vars.scss index e29dce4d5a..5748513b47 100644 --- a/core/src/components/input/input.ios.vars.scss +++ b/core/src/components/input/input.ios.vars.scss @@ -4,9 +4,6 @@ // iOS Input // -------------------------------------------------- -/// @prop - Font family of the input -$input-ios-font-family: $font-family-base !default; - /// @prop - Font size of the input $input-ios-font-size: inherit !default; diff --git a/core/src/components/input/input.md.scss b/core/src/components/input/input.md.scss index e1f0b792b7..d5a446d562 100644 --- a/core/src/components/input/input.md.scss +++ b/core/src/components/input/input.md.scss @@ -11,7 +11,6 @@ --padding-bottom: #{$input-md-padding-bottom}; --padding-start: #{$input-md-padding-start}; - font-family: $input-md-font-family; font-size: $input-md-font-size; } diff --git a/core/src/components/input/input.md.vars.scss b/core/src/components/input/input.md.vars.scss index 880d898f96..9266ba4c0b 100644 --- a/core/src/components/input/input.md.vars.scss +++ b/core/src/components/input/input.md.vars.scss @@ -4,9 +4,6 @@ // Material Design Input // -------------------------------------------------- -/// @prop - Font family of the input -$input-md-font-family: $font-family-base !default; - /// @prop - Font size of the input $input-md-font-size: inherit !default; diff --git a/core/src/components/input/input.scss b/core/src/components/input/input.scss index a172828f5c..097d1cfcf7 100644 --- a/core/src/components/input/input.scss +++ b/core/src/components/input/input.scss @@ -25,6 +25,8 @@ /* TODO: find a better solution in padding.css, that does not require !important, */ padding: 0 !important; /* stylelint-enable */ + + font-family: $font-family-base; } :host(.ion-color) { diff --git a/core/src/components/item-divider/item-divider.ios.scss b/core/src/components/item-divider/item-divider.ios.scss index 4dfcc6e32b..2d5f2f7aaf 100644 --- a/core/src/components/item-divider/item-divider.ios.scss +++ b/core/src/components/item-divider/item-divider.ios.scss @@ -13,7 +13,6 @@ position: relative; - font-family: $item-ios-divider-font-family; font-size: $item-ios-divider-font-size; } diff --git a/core/src/components/item-divider/item-divider.ios.vars.scss b/core/src/components/item-divider/item-divider.ios.vars.scss index 0943739d36..6173f89dfe 100644 --- a/core/src/components/item-divider/item-divider.ios.vars.scss +++ b/core/src/components/item-divider/item-divider.ios.vars.scss @@ -4,9 +4,6 @@ // iOS Item Divider // -------------------------------------------------- -/// @prop - Font family of the item -$item-ios-divider-font-family: $font-family-base !default; - /// @prop - Font size of the item $item-ios-divider-font-size: 17px !default; diff --git a/core/src/components/item-divider/item-divider.md.scss b/core/src/components/item-divider/item-divider.md.scss index 932f5c8a76..715b3d2717 100644 --- a/core/src/components/item-divider/item-divider.md.scss +++ b/core/src/components/item-divider/item-divider.md.scss @@ -11,7 +11,6 @@ border-bottom: $item-md-divider-border-bottom; - font-family: $item-md-divider-font-family; font-size: $item-md-divider-font-size; } diff --git a/core/src/components/item-divider/item-divider.md.vars.scss b/core/src/components/item-divider/item-divider.md.vars.scss index fe3611aad8..7064b1774f 100644 --- a/core/src/components/item-divider/item-divider.md.vars.scss +++ b/core/src/components/item-divider/item-divider.md.vars.scss @@ -10,9 +10,6 @@ $item-md-divider-color: $text-color-step-600 !default; /// @prop - Background for the divider $item-md-divider-background: $background-color !default; -/// @prop - Font family for the divider -$item-md-divider-font-family: $font-family-base !default; - /// @prop - Font size for the divider $item-md-divider-font-size: 14px !default; diff --git a/core/src/components/item-divider/item-divider.scss b/core/src/components/item-divider/item-divider.scss index c95d15c875..2fa36bf490 100644 --- a/core/src/components/item-divider/item-divider.scss +++ b/core/src/components/item-divider/item-divider.scss @@ -30,6 +30,8 @@ background-color: #{current-color(base)}; color: #{current-color(contrast)}; + font-family: $font-family-base; + overflow: hidden; z-index: $z-index-item-divider; box-sizing: border-box; diff --git a/core/src/components/item-option/item-option.scss b/core/src/components/item-option/item-option.scss index 154886ccf6..646ead051d 100644 --- a/core/src/components/item-option/item-option.scss +++ b/core/src/components/item-option/item-option.scss @@ -8,6 +8,8 @@ --ion-color-contrast: #{ion-color(primary, contrast)}; color: #{current-color(contrast)}; + + font-family: $font-family-base; } .item-option-native { diff --git a/core/src/components/item/item.ios.scss b/core/src/components/item/item.ios.scss index 1eaff242ab..4aa7191c50 100644 --- a/core/src/components/item/item.ios.scss +++ b/core/src/components/item/item.ios.scss @@ -14,7 +14,6 @@ --inner-padding-end: #{$item-ios-padding-end / 2}; --inner-border-width: #{0 0 $item-ios-border-bottom-width 0}; - font-family: $item-ios-font-family; font-size: $item-ios-font-size; } diff --git a/core/src/components/item/item.ios.vars.scss b/core/src/components/item/item.ios.vars.scss index e69bed6799..f1444f4fb0 100644 --- a/core/src/components/item/item.ios.vars.scss +++ b/core/src/components/item/item.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Item // -------------------------------------------------- -/// @prop - Font family of the item -$item-ios-font-family: $font-family-base !default; - /// @prop - Font size of the item $item-ios-font-size: 17px !default; diff --git a/core/src/components/item/item.md.scss b/core/src/components/item/item.md.scss index ea756025ed..88858c5194 100644 --- a/core/src/components/item/item.md.scss +++ b/core/src/components/item/item.md.scss @@ -14,7 +14,6 @@ --inner-padding-end: #{$item-md-padding-end / 2}; --padding-start: #{$item-md-padding-start}; - font-family: $item-md-font-family; font-size: $item-md-font-size; font-weight: normal; diff --git a/core/src/components/item/item.md.vars.scss b/core/src/components/item/item.md.vars.scss index 344034cb96..7841efcc84 100644 --- a/core/src/components/item/item.md.vars.scss +++ b/core/src/components/item/item.md.vars.scss @@ -6,9 +6,6 @@ /// @prop - Color of the item paragraph $item-md-paragraph-text-color: $text-color-step-400 !default; -/// @prop - Font family of the item -$item-md-font-family: $font-family-base !default; - /// @prop - Font size of the item $item-md-font-size: 16px !default; diff --git a/core/src/components/item/item.scss b/core/src/components/item/item.scss index c08bb3a396..2efe979ff8 100644 --- a/core/src/components/item/item.scss +++ b/core/src/components/item/item.scss @@ -35,6 +35,8 @@ color: #{current-color(contrast)}; + font-family: $font-family-base; + text-align: initial; text-decoration: none; diff --git a/core/src/components/label/label.ios.scss b/core/src/components/label/label.ios.scss index 576b76aefb..4e699ece43 100644 --- a/core/src/components/label/label.ios.scss +++ b/core/src/components/label/label.ios.scss @@ -6,8 +6,6 @@ :host { @include margin($label-ios-margin-top, $label-ios-margin-end, $label-ios-margin-bottom, $label-ios-margin-start); - - font-family: $label-ios-font-family; } :host([text-wrap]) { diff --git a/core/src/components/label/label.ios.vars.scss b/core/src/components/label/label.ios.vars.scss index 88791b62c1..e823967af9 100644 --- a/core/src/components/label/label.ios.vars.scss +++ b/core/src/components/label/label.ios.vars.scss @@ -4,9 +4,6 @@ // iOS Label // -------------------------------------------------- -/// @prop - Font family of the label -$label-ios-font-family: $font-family-base !default; - /// @prop - Text color of the label by an input, select, or datetime $label-ios-text-color: null !default; diff --git a/core/src/components/label/label.md.scss b/core/src/components/label/label.md.scss index 173ffe3142..99dfe85084 100644 --- a/core/src/components/label/label.md.scss +++ b/core/src/components/label/label.md.scss @@ -6,8 +6,6 @@ :host { @include margin($label-md-margin-top, $label-md-margin-end, $label-md-margin-bottom, $label-md-margin-start); - - font-family: $label-md-font-family; } :host([text-wrap]) { diff --git a/core/src/components/label/label.md.vars.scss b/core/src/components/label/label.md.vars.scss index 663a0ed7f7..31bc800879 100644 --- a/core/src/components/label/label.md.vars.scss +++ b/core/src/components/label/label.md.vars.scss @@ -4,9 +4,6 @@ // Material Design Label // -------------------------------------------------- -/// @prop - Font family of the label -$label-md-font-family: $font-family-base !default; - /// @prop - Text color of the label by an input, select, or datetime $label-md-text-color: $text-color-step-600 !default; diff --git a/core/src/components/label/label.scss b/core/src/components/label/label.scss index 91766c053a..832be1248c 100644 --- a/core/src/components/label/label.scss +++ b/core/src/components/label/label.scss @@ -11,6 +11,7 @@ flex: 1; + font-family: $font-family-base; font-size: inherit; text-overflow: ellipsis; diff --git a/core/src/components/loading/loading.ios.scss b/core/src/components/loading/loading.ios.scss index 859c4d0a20..7347ea5835 100644 --- a/core/src/components/loading/loading.ios.scss +++ b/core/src/components/loading/loading.ios.scss @@ -5,7 +5,6 @@ // -------------------------------------------------- .loading-ios { - font-family: $loading-ios-font-family; font-size: $loading-ios-font-size; } diff --git a/core/src/components/loading/loading.ios.vars.scss b/core/src/components/loading/loading.ios.vars.scss index 14f97fa6fe..1aa4be3589 100644 --- a/core/src/components/loading/loading.ios.vars.scss +++ b/core/src/components/loading/loading.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Loading Indicator // -------------------------------------------------- -/// @prop - Font family of the loading wrapper -$loading-ios-font-family: $font-family-base !default; - /// @prop - Font size of the loading wrapper $loading-ios-font-size: 14px !default; diff --git a/core/src/components/loading/loading.md.scss b/core/src/components/loading/loading.md.scss index a03d72816c..529f52fd0e 100644 --- a/core/src/components/loading/loading.md.scss +++ b/core/src/components/loading/loading.md.scss @@ -5,7 +5,6 @@ // -------------------------------------------------- .loading-md { - font-family: $loading-md-font-family; font-size: $loading-md-font-size; } diff --git a/core/src/components/loading/loading.md.vars.scss b/core/src/components/loading/loading.md.vars.scss index f1c272e3ce..5d9e5b7a5a 100644 --- a/core/src/components/loading/loading.md.vars.scss +++ b/core/src/components/loading/loading.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Loading Indicator // -------------------------------------------------- -/// @prop - Font family of the loading wrapper -$loading-md-font-family: $font-family-base !default; - /// @prop - Font size of the loading wrapper $loading-md-font-size: 14px !default; diff --git a/core/src/components/loading/loading.scss b/core/src/components/loading/loading.scss index ccbcb68c3b..025c63293e 100644 --- a/core/src/components/loading/loading.scss +++ b/core/src/components/loading/loading.scss @@ -13,6 +13,8 @@ ion-loading { align-items: center; justify-content: center; + font-family: $font-family-base; + contain: strict; touch-action: none; user-select: none; diff --git a/core/src/components/note/note.ios.scss b/core/src/components/note/note.ios.scss index 0000d7dc56..bd3e13a818 100644 --- a/core/src/components/note/note.ios.scss +++ b/core/src/components/note/note.ios.scss @@ -6,6 +6,4 @@ :host { --ion-color-base: #{$note-ios-color}; - - font-family: $note-ios-font-family; } diff --git a/core/src/components/note/note.ios.vars.scss b/core/src/components/note/note.ios.vars.scss index c967b798a6..1279ae12ef 100644 --- a/core/src/components/note/note.ios.vars.scss +++ b/core/src/components/note/note.ios.vars.scss @@ -3,8 +3,5 @@ // iOS Note // -------------------------------------------------- -/// @prop - Font family of the note -$note-ios-font-family: $font-family-base !default; - /// @prop - Text color of the note $note-ios-color: $text-color-step-650 !default; diff --git a/core/src/components/note/note.md.scss b/core/src/components/note/note.md.scss index dc6c0e6bc1..f81eef526e 100644 --- a/core/src/components/note/note.md.scss +++ b/core/src/components/note/note.md.scss @@ -6,6 +6,4 @@ :host { --ion-color-base: #{$note-md-color}; - - font-family: $note-md-font-family; } diff --git a/core/src/components/note/note.md.vars.scss b/core/src/components/note/note.md.vars.scss index 52bd390a44..62ca9cb152 100644 --- a/core/src/components/note/note.md.vars.scss +++ b/core/src/components/note/note.md.vars.scss @@ -3,8 +3,5 @@ // Material Design Note // -------------------------------------------------- -/// @prop - Font family of the note -$note-md-font-family: $font-family-base !default; - /// @prop - Text color of the note $note-md-color: $text-color-step-800 !default; diff --git a/core/src/components/note/note.scss b/core/src/components/note/note.scss index e29d6b7242..285b202088 100644 --- a/core/src/components/note/note.scss +++ b/core/src/components/note/note.scss @@ -5,4 +5,6 @@ :host { color: #{current-color(base)}; + + font-family: $font-family-base; } diff --git a/core/src/components/picker/picker.ios.scss b/core/src/components/picker/picker.ios.scss index 4a86ae32f0..37b175ddae 100644 --- a/core/src/components/picker/picker.ios.scss +++ b/core/src/components/picker/picker.ios.scss @@ -4,10 +4,6 @@ // iOS Picker // -------------------------------------------------- -.picker-ios { - font-family: $picker-ios-font-family; -} - .picker-ios .picker-wrapper { height: $picker-ios-height; diff --git a/core/src/components/picker/picker.ios.vars.scss b/core/src/components/picker/picker.ios.vars.scss index 2e7e86c17a..1ae31f4163 100644 --- a/core/src/components/picker/picker.ios.vars.scss +++ b/core/src/components/picker/picker.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Picker // -------------------------------------------------- -/// @prop - Font family of the picker -$picker-ios-font-family: $font-family-base !default; - /// @prop - Height of the picker wrapper $picker-ios-height: 260px !default; diff --git a/core/src/components/picker/picker.md.scss b/core/src/components/picker/picker.md.scss index b4442f908d..7db2199837 100644 --- a/core/src/components/picker/picker.md.scss +++ b/core/src/components/picker/picker.md.scss @@ -4,10 +4,6 @@ // Material Design Picker // -------------------------------------------------- -.picker-md { - font-family: $picker-md-font-family; -} - .picker-md .picker-wrapper { height: $picker-md-height; diff --git a/core/src/components/picker/picker.md.vars.scss b/core/src/components/picker/picker.md.vars.scss index 9cb59da409..8a5eee2e46 100644 --- a/core/src/components/picker/picker.md.vars.scss +++ b/core/src/components/picker/picker.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Picker // -------------------------------------------------- -/// @prop - Font family of the picker -$picker-md-font-family: $font-family-base !default; - /// @prop - Height of the picker wrapper $picker-md-height: 260px !default; diff --git a/core/src/components/picker/picker.scss b/core/src/components/picker/picker.scss index f26f48e9cf..af3275e34b 100644 --- a/core/src/components/picker/picker.scss +++ b/core/src/components/picker/picker.scss @@ -13,6 +13,8 @@ ion-picker { width: $picker-width; height: $picker-width; + font-family: $font-family-base; + contain: strict; user-select: none; z-index: $z-index-overlay; diff --git a/core/src/components/range/range.ios.scss b/core/src/components/range/range.ios.scss index f1078e702e..1fc45842c4 100644 --- a/core/src/components/range/range.ios.scss +++ b/core/src/components/range/range.ios.scss @@ -14,8 +14,6 @@ --height: #{$range-ios-slider-height}; @include padding($range-ios-padding-vertical, $range-ios-padding-horizontal); - - font-family: $range-ios-font-family; } diff --git a/core/src/components/range/range.ios.vars.scss b/core/src/components/range/range.ios.vars.scss index 0a52d34bff..b292e7b3cf 100644 --- a/core/src/components/range/range.ios.vars.scss +++ b/core/src/components/range/range.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Range // -------------------------------------------------- -/// @prop - Padding top/bottom of the range -$range-ios-font-family: $font-family-base !default; - /// @prop - Padding top/bottom of the range $range-ios-padding-vertical: 8px !default; diff --git a/core/src/components/range/range.md.scss b/core/src/components/range/range.md.scss index 91ee5a4f11..6a2552b3df 100644 --- a/core/src/components/range/range.md.scss +++ b/core/src/components/range/range.md.scss @@ -15,7 +15,6 @@ @include padding($range-md-padding-vertical, $range-md-padding-horizontal); - font-family: $range-md-font-family; font-size: $range-md-pin-font-size; } diff --git a/core/src/components/range/range.md.vars.scss b/core/src/components/range/range.md.vars.scss index f209b2d43e..122fa2e8db 100644 --- a/core/src/components/range/range.md.vars.scss +++ b/core/src/components/range/range.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Range // -------------------------------------------------- -/// @prop - Font family of the range -$range-md-font-family: $font-family-base !default; - /// @prop - Padding top/bottom of the range $range-md-padding-vertical: 8px !default; diff --git a/core/src/components/range/range.scss b/core/src/components/range/range.scss index ad38803700..750587b3f2 100644 --- a/core/src/components/range/range.scss +++ b/core/src/components/range/range.scss @@ -14,6 +14,8 @@ flex: 1; align-items: center; + font-family: $font-family-base; + user-select: none; } diff --git a/core/src/components/searchbar/searchbar.ios.scss b/core/src/components/searchbar/searchbar.ios.scss index 7d135456a2..a146a72bd1 100644 --- a/core/src/components/searchbar/searchbar.ios.scss +++ b/core/src/components/searchbar/searchbar.ios.scss @@ -16,8 +16,6 @@ color: $searchbar-ios-input-text-color; - font-family: $searchbar-ios-font-family; - contain: strict; } diff --git a/core/src/components/searchbar/searchbar.ios.vars.scss b/core/src/components/searchbar/searchbar.ios.vars.scss index 1eab9933f4..3a1ab6001a 100644 --- a/core/src/components/searchbar/searchbar.ios.vars.scss +++ b/core/src/components/searchbar/searchbar.ios.vars.scss @@ -15,9 +15,6 @@ $searchbar-ios-padding-bottom: $searchbar-ios-padding-top !de /// @prop - Padding start of the searchbar $searchbar-ios-padding-start: $searchbar-ios-padding-end !default; -/// @prop - Font family of the searchbar -$searchbar-ios-font-family: $font-family-base !default; - /// @prop - Font size of the searchbar cancel button $searchbar-ios-cancel-button-font-size: 16px !default; diff --git a/core/src/components/searchbar/searchbar.md.scss b/core/src/components/searchbar/searchbar.md.scss index 44b254cb7e..413fe6db8a 100644 --- a/core/src/components/searchbar/searchbar.md.scss +++ b/core/src/components/searchbar/searchbar.md.scss @@ -15,8 +15,6 @@ background: $searchbar-md-background; color: $searchbar-md-input-text-color; - - font-family: $searchbar-md-font-family; } diff --git a/core/src/components/searchbar/searchbar.md.vars.scss b/core/src/components/searchbar/searchbar.md.vars.scss index 169c52ed49..50cf5d4e63 100644 --- a/core/src/components/searchbar/searchbar.md.vars.scss +++ b/core/src/components/searchbar/searchbar.md.vars.scss @@ -15,9 +15,6 @@ $searchbar-md-padding-bottom: $searchbar-md-padding-top !defa /// @prop - Padding start of the searchbar $searchbar-md-padding-start: $searchbar-md-padding-end !default; -/// @prop - Font family of the searchbar -$searchbar-md-font-family: $font-family-base !default; - /// @prop - Background of the searchbar $searchbar-md-background: inherit !default; diff --git a/core/src/components/searchbar/searchbar.scss b/core/src/components/searchbar/searchbar.scss index daad2777f4..08777a3ca9 100644 --- a/core/src/components/searchbar/searchbar.scss +++ b/core/src/components/searchbar/searchbar.scss @@ -17,6 +17,8 @@ width: 100%; box-sizing: border-box; + + font-family: $font-family-base; } :host(.ion-color) { diff --git a/core/src/components/segment/segment.ios.scss b/core/src/components/segment/segment.ios.scss index cd3deed52c..190329fa64 100644 --- a/core/src/components/segment/segment.ios.scss +++ b/core/src/components/segment/segment.ios.scss @@ -13,8 +13,6 @@ --color: #{ion-color(primary, base)}; --color-checked: #{ion-color(primary, contrast)}; --color-disabled: #{ion-color(primary, base, $segment-button-ios-opacity-disabled)}; - - font-family: $segment-ios-font-family; } :host(.segment-disabled) { diff --git a/core/src/components/segment/segment.ios.vars.scss b/core/src/components/segment/segment.ios.vars.scss index 708ca5972f..dcaef28e21 100644 --- a/core/src/components/segment/segment.ios.vars.scss +++ b/core/src/components/segment/segment.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Segment // -------------------------------------------------- -/// @prop - Background of the segment button -$segment-ios-font-family: $font-family-base !default; - /// @prop - Opacity of the disabled segment $segment-ios-opacity-disabled: .4 !default; diff --git a/core/src/components/segment/segment.md.scss b/core/src/components/segment/segment.md.scss index 41ea5c5a8d..bcab8c3210 100644 --- a/core/src/components/segment/segment.md.scss +++ b/core/src/components/segment/segment.md.scss @@ -10,8 +10,6 @@ --border-color: #{$segment-button-md-border-bottom-color}; --color: #{$segment-button-md-text-color}; --color-checked: #{$segment-button-md-text-color}; - - font-family: $segment-md-font-family; } :host(.segment-disabled) { diff --git a/core/src/components/segment/segment.md.vars.scss b/core/src/components/segment/segment.md.vars.scss index 6dd91d433f..cbee904b09 100644 --- a/core/src/components/segment/segment.md.vars.scss +++ b/core/src/components/segment/segment.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Segment // -------------------------------------------------- -/// @prop - Background of the segment button -$segment-md-font-family: $font-family-base !default; - /// @prop - Opacity of the disabled segment $segment-md-opacity-disabled: .3 !default; diff --git a/core/src/components/segment/segment.scss b/core/src/components/segment/segment.scss index 6bf73dbdb1..0fa1b28ca9 100644 --- a/core/src/components/segment/segment.scss +++ b/core/src/components/segment/segment.scss @@ -25,6 +25,8 @@ width: 100%; + font-family: $font-family-base; + text-align: center; } diff --git a/core/src/components/select/select.ios.scss b/core/src/components/select/select.ios.scss index e3bf78a956..4d6e8fba62 100644 --- a/core/src/components/select/select.ios.scss +++ b/core/src/components/select/select.ios.scss @@ -12,10 +12,6 @@ --padding-bottom: #{$select-ios-padding-bottom}; --padding-start: #{$select-ios-padding-start}; --placeholder-color: #{$select-ios-placeholder-color}; - - color: var(--color); - - font-family: $select-ios-font-family; } .select-placeholder { diff --git a/core/src/components/select/select.ios.vars.scss b/core/src/components/select/select.ios.vars.scss index 03fa97f9dd..58c4b23386 100644 --- a/core/src/components/select/select.ios.vars.scss +++ b/core/src/components/select/select.ios.vars.scss @@ -16,9 +16,6 @@ $select-ios-padding-bottom: $item-ios-padding-bottom !default; /// @prop - Padding start of the select $select-ios-padding-start: $item-ios-padding-start !default; -/// @prop - Font family of the select -$select-ios-font-family: $font-family-base !default; - /// @prop - Color of the select icon $select-ios-icon-color: $text-color-step-650 !default; diff --git a/core/src/components/select/select.md.scss b/core/src/components/select/select.md.scss index 2279db3ef7..e2d7dc2e3c 100644 --- a/core/src/components/select/select.md.scss +++ b/core/src/components/select/select.md.scss @@ -12,10 +12,6 @@ --padding-bottom: #{$select-md-padding-bottom}; --padding-start: #{$select-md-padding-start}; --placeholder-color: #{$select-md-placeholder-color}; - - color: var(--color); - - font-family: $select-md-font-family; } .select-placeholder { diff --git a/core/src/components/select/select.md.vars.scss b/core/src/components/select/select.md.vars.scss index c0fad18222..d5a35c4ded 100644 --- a/core/src/components/select/select.md.vars.scss +++ b/core/src/components/select/select.md.vars.scss @@ -16,9 +16,6 @@ $select-md-padding-bottom: $item-md-padding-bottom !default; /// @prop - Padding start of the select $select-md-padding-start: $item-md-padding-start !default; -/// @prop - Font family of the select -$select-md-font-family: $font-family-base !default; - /// @prop - Color of the select icon $select-md-icon-color: $text-color-step-600 !default; diff --git a/core/src/components/select/select.scss b/core/src/components/select/select.scss index 83e98b3c24..b623787c9a 100644 --- a/core/src/components/select/select.scss +++ b/core/src/components/select/select.scss @@ -18,6 +18,10 @@ display: flex; + color: var(--color); + + font-family: $font-family-base; + overflow: hidden; } diff --git a/core/src/components/textarea/textarea.ios.scss b/core/src/components/textarea/textarea.ios.scss index 6d2b55f13d..561421957b 100644 --- a/core/src/components/textarea/textarea.ios.scss +++ b/core/src/components/textarea/textarea.ios.scss @@ -10,6 +10,5 @@ --padding-bottom: #{$textarea-ios-padding-bottom}; --padding-start: #{$textarea-ios-padding-start}; - font-family: $textarea-ios-font-family; font-size: $textarea-ios-font-size; } diff --git a/core/src/components/textarea/textarea.ios.vars.scss b/core/src/components/textarea/textarea.ios.vars.scss index 091f2a156d..2c88c54e88 100644 --- a/core/src/components/textarea/textarea.ios.vars.scss +++ b/core/src/components/textarea/textarea.ios.vars.scss @@ -7,9 +7,6 @@ /// @prop - Margin start of the textarea when it is after a label $textarea-ios-by-label-margin-start: $item-ios-padding-start !default; -/// @prop - Font family of the textarea -$textarea-ios-font-family: $font-family-base !default; - /// @prop - Font size of the textarea $textarea-ios-font-size: inherit !default; diff --git a/core/src/components/textarea/textarea.md.scss b/core/src/components/textarea/textarea.md.scss index 15f92dda38..7365570fbc 100644 --- a/core/src/components/textarea/textarea.md.scss +++ b/core/src/components/textarea/textarea.md.scss @@ -10,6 +10,5 @@ --padding-bottom: #{$textarea-md-padding-bottom}; --padding-start: #{$textarea-md-padding-start}; - font-family: $textarea-md-font-family; font-size: $textarea-md-font-size; } diff --git a/core/src/components/textarea/textarea.md.vars.scss b/core/src/components/textarea/textarea.md.vars.scss index 0a19ce35f9..94f15553a6 100644 --- a/core/src/components/textarea/textarea.md.vars.scss +++ b/core/src/components/textarea/textarea.md.vars.scss @@ -4,9 +4,6 @@ // Material Design Textarea // -------------------------------------------------- -/// @prop - Font family of the textarea -$textarea-md-font-family: $font-family-base !default; - /// @prop - Font size of the textarea $textarea-md-font-size: inherit !default; diff --git a/core/src/components/textarea/textarea.scss b/core/src/components/textarea/textarea.scss index a333ac9e31..d88900c0fd 100644 --- a/core/src/components/textarea/textarea.scss +++ b/core/src/components/textarea/textarea.scss @@ -37,6 +37,8 @@ background: var(--background); color: var(--color); + + font-family: $font-family-base; } :host(.ion-color) { diff --git a/core/src/components/toast/toast.ios.scss b/core/src/components/toast/toast.ios.scss index 8c63c9e82b..f1f791b5d6 100644 --- a/core/src/components/toast/toast.ios.scss +++ b/core/src/components/toast/toast.ios.scss @@ -9,7 +9,6 @@ --button-color: #{$toast-ios-button-color}; --color: #{$toast-ios-title-color}; - font-family: $toast-ios-font-family; font-size: $toast-ios-title-font-size; } diff --git a/core/src/components/toast/toast.ios.vars.scss b/core/src/components/toast/toast.ios.vars.scss index 50b9ecd5ed..be9c6b5f38 100644 --- a/core/src/components/toast/toast.ios.vars.scss +++ b/core/src/components/toast/toast.ios.vars.scss @@ -3,9 +3,6 @@ // iOS Toast // -------------------------------------------------- -/// @prop - Font family of the toast -$toast-ios-font-family: $font-family-base !default; - /// @prop - Background Color of the toast wrapper $toast-ios-background-color: $background-color-step-50 !default; diff --git a/core/src/components/toast/toast.md.scss b/core/src/components/toast/toast.md.scss index 66cd2a5636..f9c6133aa3 100644 --- a/core/src/components/toast/toast.md.scss +++ b/core/src/components/toast/toast.md.scss @@ -8,7 +8,6 @@ --background: #{$toast-md-background}; --color: #{$toast-md-title-color}; - font-family: $toast-md-font-family; font-size: $toast-md-title-font-size; } diff --git a/core/src/components/toast/toast.md.vars.scss b/core/src/components/toast/toast.md.vars.scss index d2a6aa470a..19b4092351 100644 --- a/core/src/components/toast/toast.md.vars.scss +++ b/core/src/components/toast/toast.md.vars.scss @@ -3,9 +3,6 @@ // Material Design Toast // -------------------------------------------------- -/// @prop - Font family of the toast -$toast-md-font-family: $font-family-base !default; - /// @prop - Background of the toast wrapper $toast-md-background: $text-color-step-150 !default; diff --git a/core/src/components/toast/toast.scss b/core/src/components/toast/toast.scss index b3fd462bdd..3703dfaa0f 100644 --- a/core/src/components/toast/toast.scss +++ b/core/src/components/toast/toast.scss @@ -19,6 +19,8 @@ ion-toast { color: var(--color); + font-family: $font-family-base; + contain: strict; z-index: $z-index-overlay; pointer-events: none; diff --git a/core/src/components/toolbar/toolbar.ios.scss b/core/src/components/toolbar/toolbar.ios.scss index 3391a33cd9..6f399aec1f 100644 --- a/core/src/components/toolbar/toolbar.ios.scss +++ b/core/src/components/toolbar/toolbar.ios.scss @@ -13,8 +13,6 @@ --padding-start: #{$toolbar-ios-padding}; --padding-end: #{$toolbar-ios-padding}; --min-height: #{$toolbar-ios-height}; - - font-family: $toolbar-ios-font-family; } // iOS Toolbar Content diff --git a/core/src/components/toolbar/toolbar.ios.vars.scss b/core/src/components/toolbar/toolbar.ios.vars.scss index e4d1806808..29ee00254d 100644 --- a/core/src/components/toolbar/toolbar.ios.vars.scss +++ b/core/src/components/toolbar/toolbar.ios.vars.scss @@ -15,9 +15,6 @@ $toolbar-order-ios: ( menu-toggle-end: 7, ); -/// @prop - Font family of the toolbar -$toolbar-ios-font-family: $font-family-base !default; - /// @prop - Font size of the toolbar button $toolbar-ios-button-font-size: 17px !default; diff --git a/core/src/components/toolbar/toolbar.md.scss b/core/src/components/toolbar/toolbar.md.scss index 2e46fa4e45..fef8be0d4c 100644 --- a/core/src/components/toolbar/toolbar.md.scss +++ b/core/src/components/toolbar/toolbar.md.scss @@ -13,8 +13,6 @@ --padding-start: #{$toolbar-md-padding}; --padding-end: #{$toolbar-md-padding}; --min-height: #{$toolbar-md-height}; - - font-family: $toolbar-md-font-family; } diff --git a/core/src/components/toolbar/toolbar.md.vars.scss b/core/src/components/toolbar/toolbar.md.vars.scss index 57034228ad..8c017b9166 100644 --- a/core/src/components/toolbar/toolbar.md.vars.scss +++ b/core/src/components/toolbar/toolbar.md.vars.scss @@ -15,9 +15,6 @@ $toolbar-order-md: ( menu-toggle-end: 7, ); -/// @prop - Font family of the toolbar -$toolbar-md-font-family: $font-family-base !default; - /// @prop - Font size of the toolbar button $toolbar-md-button-font-size: 14px !default; diff --git a/core/src/components/toolbar/toolbar.scss b/core/src/components/toolbar/toolbar.scss index 946586bb2d..b5d4571fec 100644 --- a/core/src/components/toolbar/toolbar.scss +++ b/core/src/components/toolbar/toolbar.scss @@ -31,6 +31,8 @@ color: var(--color); + font-family: $font-family-base; + contain: content; z-index: $z-index-toolbar;