javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 11:41:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(all): cleanup mode font

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2018-08-24 03:33:44 +02:00
parent 0d8097b3ad
commit d12ef78de6
109 changed files with 54 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/components/action-sheet/action-sheet.ios.scss
View File

@ -5,8 +5,6 @@
// -------------------------------------------------- // --------------------------------------------------
:host { :host {
font-family: $action-sheet-ios-font-family;
text-align: $action-sheet-ios-text-align; text-align: $action-sheet-ios-text-align;
} }

3
core/src/components/action-sheet/action-sheet.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Action Sheet // 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 /// @prop - Text align of the action sheet
$action-sheet-ios-text-align: center !default; $action-sheet-ios-text-align: center !default;

7
core/src/components/action-sheet/action-sheet.md.scss
View File

@ -1,13 +1,6 @@
@import "./action-sheet"; @import "./action-sheet";
@import "./action-sheet.md.vars"; @import "./action-sheet.md.vars";
// Material Design Action Sheet
// --------------------------------------------------
:host {
font-family: $action-sheet-md-font-family;
}
// Material Design Action Sheet Title // Material Design Action Sheet Title
// ----------------------------------------- // -----------------------------------------

3
core/src/components/action-sheet/action-sheet.md.vars.scss
View File

@ -3,9 +3,6 @@
// Material Design Action Sheet // 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 /// @prop - Text align of the action sheet
$action-sheet-md-text-align: start !default; $action-sheet-md-text-align: start !default;

2
core/src/components/action-sheet/action-sheet.scss
View File

@ -13,6 +13,8 @@
display: block; display: block;
position: fixed; position: fixed;
font-family: $font-family-base;
touch-action: none; touch-action: none;
user-select: none; user-select: none;
z-index: $z-index-overlay; z-index: $z-index-overlay;

1
core/src/components/alert/alert.ios.scss
View File

@ -8,7 +8,6 @@
--background: #{$alert-ios-background-color}; --background: #{$alert-ios-background-color};
--max-width: #{$alert-ios-max-width}; --max-width: #{$alert-ios-max-width};
font-family: $alert-ios-font-family;
font-size: $alert-ios-font-size; font-size: $alert-ios-font-size;
} }

3
core/src/components/alert/alert.ios.vars.scss
View File

@ -4,9 +4,6 @@
// iOS Alert // iOS Alert
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the alert
$alert-ios-font-family: $font-family-base !default;
/// @prop - Font size of the alert /// @prop - Font size of the alert
$alert-ios-font-size: 14px !default; $alert-ios-font-size: 14px !default;

1
core/src/components/alert/alert.md.scss
View File

@ -8,7 +8,6 @@
--background: #{$alert-md-background-color}; --background: #{$alert-md-background-color};
--max-width: #{$alert-md-max-width}; --max-width: #{$alert-md-max-width};
font-family: $alert-md-font-family;
font-size: $alert-md-font-size; font-size: $alert-md-font-size;
} }

3
core/src/components/alert/alert.md.vars.scss
View File

@ -4,9 +4,6 @@
// Material Design Alert // Material Design Alert
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the alert
$alert-md-font-family: $font-family-base !default;
/// @prop - Font size of the alert /// @prop - Font size of the alert
$alert-md-font-size: 14px !default; $alert-md-font-size: 14px !default;

2
core/src/components/alert/alert.scss
View File

@ -16,6 +16,8 @@
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-family: $font-family-base;
contain: strict; contain: strict;
touch-action: none; touch-action: none;
user-select: none; user-select: none;

2
core/src/components/badge/badge.ios.scss
View File

@ -6,6 +6,4 @@
:host { :host {
@include border-radius($badge-ios-border-radius); @include border-radius($badge-ios-border-radius);
font-family: $badge-ios-font-family;
} }

3
core/src/components/badge/badge.ios.vars.scss
View File

@ -5,6 +5,3 @@
/// @prop - Border radius of the badge /// @prop - Border radius of the badge
$badge-ios-border-radius: 10px !default; $badge-ios-border-radius: 10px !default;
/// @prop - Font family of the badge
$badge-ios-font-family: $font-family-base !default;

2
core/src/components/badge/badge.md.scss
View File

@ -6,6 +6,4 @@
:host { :host {
@include border-radius($badge-md-border-radius); @include border-radius($badge-md-border-radius);
font-family: $badge-md-font-family;
} }

3
core/src/components/badge/badge.md.vars.scss
View File

@ -5,6 +5,3 @@
/// @prop - Border radius of the badge /// @prop - Border radius of the badge
$badge-md-border-radius: 4px !default; $badge-md-border-radius: 4px !default;
/// @prop - Font family of the badge
$badge-md-font-family: $font-family-base !default;

1
core/src/components/badge/badge.scss
View File

@ -30,6 +30,7 @@
background: var(--background); background: var(--background);
color: var(--color); color: var(--color);
font-family: $font-family-base;
font-size: $badge-font-size; font-size: $badge-font-size;
font-weight: $badge-font-weight; font-weight: $badge-font-weight;

1
core/src/components/button/button.ios.scss
View File

@ -18,7 +18,6 @@
--height: #{$button-ios-height}; --height: #{$button-ios-height};
--transition: background-color, opacity 100ms linear; --transition: background-color, opacity 100ms linear;
font-family: #{$button-ios-font-family};
font-size: #{$button-ios-font-size}; font-size: #{$button-ios-font-size};
font-weight: #{$button-ios-font-weight}; font-weight: #{$button-ios-font-weight};

3
core/src/components/button/button.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Button // iOS Button
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the button
$button-ios-font-family: $font-family-base !default;
/// @prop - Margin top of the button /// @prop - Margin top of the button
$button-ios-margin-top: 4px !default; $button-ios-margin-top: 4px !default;

1
core/src/components/button/button.md.scss
View File

@ -19,7 +19,6 @@
--padding-end: #{$button-md-padding-end}; --padding-end: #{$button-md-padding-end};
--height: #{$button-md-height}; --height: #{$button-md-height};
font-family: #{$button-md-font-family};
font-size: #{$button-md-font-size}; font-size: #{$button-md-font-size};
font-weight: #{$button-md-font-weight}; font-weight: #{$button-md-font-weight};

3
core/src/components/button/button.md.vars.scss
View File

@ -3,9 +3,6 @@
// Material Design Button // Material Design Button
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the button
$button-md-font-family: $font-family-base !default;
/// @prop - Margin top of the button /// @prop - Margin top of the button
$button-md-margin-top: 4px; $button-md-margin-top: 4px;

2
core/src/components/button/button.scss
View File

@ -12,6 +12,8 @@
display: inline-block; display: inline-block;
font-family: $font-family-base;
text-align: center; text-align: center;
text-decoration: none; text-decoration: none;
text-overflow: ellipsis; text-overflow: ellipsis;

3
core/src/components/buttons/buttons.ios.vars.scss
View File

@ -15,9 +15,6 @@ $toolbar-order-ios: (
menu-toggle-end: 7, 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 /// @prop - Font size of the toolbar button
$toolbar-ios-button-font-size: 17px !default; $toolbar-ios-button-font-size: 17px !default;

3
core/src/components/buttons/buttons.md.vars.scss
View File

@ -15,9 +15,6 @@ $toolbar-order-md: (
menu-toggle-end: 7, 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 /// @prop - Font size of the toolbar button
$toolbar-md-button-font-size: 14px !default; $toolbar-md-button-font-size: 14px !default;

1
core/src/components/card/card.ios.scss
View File

@ -13,7 +13,6 @@
transform: translateZ(0); transform: translateZ(0);
font-family: $card-ios-font-family;
font-size: $card-ios-font-size; font-size: $card-ios-font-size;
box-shadow: $card-ios-box-shadow; box-shadow: $card-ios-box-shadow;

3
core/src/components/card/card.ios.vars.scss
View File

@ -27,9 +27,6 @@ $card-ios-box-shadow: 0 4px 16px $card-ios-box-shadow-color !de
/// @prop - Border radius of the card /// @prop - Border radius of the card
$card-ios-border-radius: 8px !default; $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 /// @prop - Font size of the card
$card-ios-font-size: 14px !default; $card-ios-font-size: 14px !default;

1
core/src/components/card/card.md.scss
View File

@ -11,7 +11,6 @@
@include margin($card-md-margin-top, $card-md-margin-end, $card-md-margin-bottom, $card-md-margin-start); @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); @include border-radius($card-md-border-radius);
font-family: $card-md-font-family;
font-size: $card-md-font-size; font-size: $card-md-font-size;
box-shadow: $card-md-box-shadow; box-shadow: $card-md-box-shadow;

3
core/src/components/card/card.md.vars.scss
View File

@ -27,9 +27,6 @@ $card-md-border-radius: 2px !default;
/// @prop - Font size of the card /// @prop - Font size of the card
$card-md-font-size: 14px !default; $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 /// @prop - Line height of the card
$card-md-line-height: 1.5 !default; $card-md-line-height: 1.5 !default;

2
core/src/components/card/card.scss
View File

@ -17,6 +17,8 @@
background: var(--background); background: var(--background);
color: var(--color); color: var(--color);
font-family: $font-family-base;
overflow: hidden; overflow: hidden;
} }

1
core/src/components/chip/chip.ios.scss
View File

@ -27,6 +27,5 @@
height: $chip-ios-height; height: $chip-ios-height;
font-family: $chip-ios-font-family;
font-size: $chip-ios-font-size; font-size: $chip-ios-font-size;
} }

3
core/src/components/chip/chip.ios.vars.scss
View File

@ -21,9 +21,6 @@ $chip-ios-height: 32px !default;
/// @prop - Border radius of the chip /// @prop - Border radius of the chip
$chip-ios-border-radius: 16px !default; $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 /// @prop - Font size of the chip
$chip-ios-font-size: 13px !default; $chip-ios-font-size: 13px !default;

1
core/src/components/chip/chip.md.scss
View File

@ -27,6 +27,5 @@
height: $chip-md-height; height: $chip-md-height;
font-family: $chip-md-font-family;
font-size: $chip-md-font-size; font-size: $chip-md-font-size;
} }

3
core/src/components/chip/chip.md.vars.scss
View File

@ -21,9 +21,6 @@ $chip-md-height: 32px !default;
/// @prop - Border radius of the chip /// @prop - Border radius of the chip
$chip-md-border-radius: 16px !default; $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 /// @prop - Font size of the chip
$chip-md-font-size: 13px !default; $chip-md-font-size: 13px !default;

1
core/src/components/chip/chip.scss
View File

@ -31,6 +31,7 @@
background: var(--background); background: var(--background);
color: var(--color); color: var(--color);
font-family: $font-family-base;
font-weight: normal; font-weight: normal;
vertical-align: middle; vertical-align: middle;

24
core/src/components/content/readme.md
View File

@ -41,19 +41,17 @@ view component.
## CSS Custom Properties ## CSS Custom Properties
| Name | Description | | Name | Description |
| ------------------- | ----------------------------------- | | ------------------- | ------------------------------ |
| `--background` | Background of the Content | | `--background` | Background of the Content |
| `--color` | Color of the Content | | `--color` | Color of the Content |
| `--hr-background` | Background of the hr in the Content | | `--keyboard-offset` | Keyboard offset of the Content |
| `--hr-height` | Height of the hr in the Content | | `--offset-bottom` | Offset bottom of the Content |
| `--keyboard-offset` | Keyboard offset of the Content | | `--offset-top` | Offset top of the Content |
| `--offset-bottom` | Offset bottom of the Content | | `--padding-bottom` | Padding bottom of the Content |
| `--offset-top` | Offset top of the Content | | `--padding-end` | Padding end of the Content |
| `--padding-bottom` | Padding bottom of the Content | | `--padding-start` | Padding start of the Content |
| `--padding-end` | Padding end of the Content | | `--padding-top` | Padding top of the Content |
| `--padding-start` | Padding start of the Content |
| `--padding-top` | Padding top of the Content |
---------------------------------------------- ----------------------------------------------

2
core/src/components/datetime/datetime.ios.scss
View File

@ -6,8 +6,6 @@
.datetime-ios { .datetime-ios {
@include padding($datetime-ios-padding-top, $datetime-ios-padding-end, $datetime-ios-padding-bottom, $datetime-ios-padding-start); @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 { .datetime-ios .datetime-placeholder {

3
core/src/components/datetime/datetime.ios.vars.scss
View File

@ -16,8 +16,5 @@ $datetime-ios-padding-bottom: $item-ios-padding-bottom !default;
/// @prop - Padding start of the datetime /// @prop - Padding start of the datetime
$datetime-ios-padding-start: $item-ios-padding-start !default; $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 /// @prop - Color of the datetime placeholder
$datetime-ios-placeholder-color: $text-color-step-600 !default; $datetime-ios-placeholder-color: $text-color-step-600 !default;

2
core/src/components/datetime/datetime.md.scss
View File

@ -6,8 +6,6 @@
.datetime-md { .datetime-md {
@include padding($datetime-md-padding-top, $datetime-md-padding-end, $datetime-md-padding-bottom, $datetime-md-padding-start); @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 { .datetime-md .datetime-placeholder {

3
core/src/components/datetime/datetime.md.vars.scss
View File

@ -16,8 +16,5 @@ $datetime-md-padding-bottom: $item-md-padding-bottom !default;
/// @prop - Padding start of the datetime /// @prop - Padding start of the datetime
$datetime-md-padding-start: $item-md-padding-start !default; $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 /// @prop - Color of the datetime placeholder
$datetime-md-placeholder-color: $placeholder-text-color !default; $datetime-md-placeholder-color: $placeholder-text-color !default;

2
core/src/components/datetime/datetime.scss
View File

@ -7,6 +7,8 @@ ion-datetime {
display: flex; display: flex;
position: relative; position: relative;
font-family: $font-family-base;
overflow: hidden; overflow: hidden;
} }

1
core/src/components/input/input.ios.scss
View File

@ -7,7 +7,6 @@
--padding-bottom: #{$input-ios-padding-bottom}; --padding-bottom: #{$input-ios-padding-bottom};
--padding-start: #{$input-ios-padding-start}; --padding-start: #{$input-ios-padding-start};
font-family: $input-ios-font-family;
font-size: $input-ios-font-size; font-size: $input-ios-font-size;
} }

3
core/src/components/input/input.ios.vars.scss
View File

@ -4,9 +4,6 @@
// iOS Input // iOS Input
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the input
$input-ios-font-family: $font-family-base !default;
/// @prop - Font size of the input /// @prop - Font size of the input
$input-ios-font-size: inherit !default; $input-ios-font-size: inherit !default;

1
core/src/components/input/input.md.scss
View File

@ -11,7 +11,6 @@
--padding-bottom: #{$input-md-padding-bottom}; --padding-bottom: #{$input-md-padding-bottom};
--padding-start: #{$input-md-padding-start}; --padding-start: #{$input-md-padding-start};
font-family: $input-md-font-family;
font-size: $input-md-font-size; font-size: $input-md-font-size;
} }

3
core/src/components/input/input.md.vars.scss
View File

@ -4,9 +4,6 @@
// Material Design Input // Material Design Input
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the input
$input-md-font-family: $font-family-base !default;
/// @prop - Font size of the input /// @prop - Font size of the input
$input-md-font-size: inherit !default; $input-md-font-size: inherit !default;

2
core/src/components/input/input.scss
View File

@ -25,6 +25,8 @@
/* TODO: find a better solution in padding.css, that does not require !important, */ /* TODO: find a better solution in padding.css, that does not require !important, */
padding: 0 !important; padding: 0 !important;
/* stylelint-enable */ /* stylelint-enable */
font-family: $font-family-base;
} }
:host(.ion-color) { :host(.ion-color) {

1
core/src/components/item-divider/item-divider.ios.scss
View File

@ -13,7 +13,6 @@
position: relative; position: relative;
font-family: $item-ios-divider-font-family;
font-size: $item-ios-divider-font-size; font-size: $item-ios-divider-font-size;
} }

3
core/src/components/item-divider/item-divider.ios.vars.scss
View File

@ -4,9 +4,6 @@
// iOS Item Divider // iOS Item Divider
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the item
$item-ios-divider-font-family: $font-family-base !default;
/// @prop - Font size of the item /// @prop - Font size of the item
$item-ios-divider-font-size: 17px !default; $item-ios-divider-font-size: 17px !default;

1
core/src/components/item-divider/item-divider.md.scss
View File

@ -11,7 +11,6 @@
border-bottom: $item-md-divider-border-bottom; border-bottom: $item-md-divider-border-bottom;
font-family: $item-md-divider-font-family;
font-size: $item-md-divider-font-size; font-size: $item-md-divider-font-size;
} }

3
core/src/components/item-divider/item-divider.md.vars.scss
View File

@ -10,9 +10,6 @@ $item-md-divider-color: $text-color-step-600 !default;
/// @prop - Background for the divider /// @prop - Background for the divider
$item-md-divider-background: $background-color !default; $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 /// @prop - Font size for the divider
$item-md-divider-font-size: 14px !default; $item-md-divider-font-size: 14px !default;

2
core/src/components/item-divider/item-divider.scss
View File

@ -30,6 +30,8 @@
background-color: #{current-color(base)}; background-color: #{current-color(base)};
color: #{current-color(contrast)}; color: #{current-color(contrast)};
font-family: $font-family-base;
overflow: hidden; overflow: hidden;
z-index: $z-index-item-divider; z-index: $z-index-item-divider;
box-sizing: border-box; box-sizing: border-box;

2
core/src/components/item-option/item-option.scss
View File

@ -8,6 +8,8 @@
--ion-color-contrast: #{ion-color(primary, contrast)}; --ion-color-contrast: #{ion-color(primary, contrast)};
color: #{current-color(contrast)}; color: #{current-color(contrast)};
font-family: $font-family-base;
} }
.item-option-native { .item-option-native {

1
core/src/components/item/item.ios.scss
View File

@ -14,7 +14,6 @@
--inner-padding-end: #{$item-ios-padding-end / 2}; --inner-padding-end: #{$item-ios-padding-end / 2};
--inner-border-width: #{0 0 $item-ios-border-bottom-width 0}; --inner-border-width: #{0 0 $item-ios-border-bottom-width 0};
font-family: $item-ios-font-family;
font-size: $item-ios-font-size; font-size: $item-ios-font-size;
} }

3
core/src/components/item/item.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Item // iOS Item
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the item
$item-ios-font-family: $font-family-base !default;
/// @prop - Font size of the item /// @prop - Font size of the item
$item-ios-font-size: 17px !default; $item-ios-font-size: 17px !default;

1
core/src/components/item/item.md.scss
View File

@ -14,7 +14,6 @@
--inner-padding-end: #{$item-md-padding-end / 2}; --inner-padding-end: #{$item-md-padding-end / 2};
--padding-start: #{$item-md-padding-start}; --padding-start: #{$item-md-padding-start};
font-family: $item-md-font-family;
font-size: $item-md-font-size; font-size: $item-md-font-size;
font-weight: normal; font-weight: normal;

3
core/src/components/item/item.md.vars.scss
View File

@ -6,9 +6,6 @@
/// @prop - Color of the item paragraph /// @prop - Color of the item paragraph
$item-md-paragraph-text-color: $text-color-step-400 !default; $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 /// @prop - Font size of the item
$item-md-font-size: 16px !default; $item-md-font-size: 16px !default;

2
core/src/components/item/item.scss
View File

@ -35,6 +35,8 @@
color: #{current-color(contrast)}; color: #{current-color(contrast)};
font-family: $font-family-base;
text-align: initial; text-align: initial;
text-decoration: none; text-decoration: none;

2
core/src/components/label/label.ios.scss
View File

@ -6,8 +6,6 @@
:host { :host {
@include margin($label-ios-margin-top, $label-ios-margin-end, $label-ios-margin-bottom, $label-ios-margin-start); @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]) { :host([text-wrap]) {

3
core/src/components/label/label.ios.vars.scss
View File

@ -4,9 +4,6 @@
// iOS Label // 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 /// @prop - Text color of the label by an input, select, or datetime
$label-ios-text-color: null !default; $label-ios-text-color: null !default;

2
core/src/components/label/label.md.scss
View File

@ -6,8 +6,6 @@
:host { :host {
@include margin($label-md-margin-top, $label-md-margin-end, $label-md-margin-bottom, $label-md-margin-start); @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]) { :host([text-wrap]) {

3
core/src/components/label/label.md.vars.scss
View File

@ -4,9 +4,6 @@
// Material Design Label // 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 /// @prop - Text color of the label by an input, select, or datetime
$label-md-text-color: $text-color-step-600 !default; $label-md-text-color: $text-color-step-600 !default;

1
core/src/components/label/label.scss
View File

@ -11,6 +11,7 @@
flex: 1; flex: 1;
font-family: $font-family-base;
font-size: inherit; font-size: inherit;
text-overflow: ellipsis; text-overflow: ellipsis;

1
core/src/components/loading/loading.ios.scss
View File

@ -5,7 +5,6 @@
// -------------------------------------------------- // --------------------------------------------------
.loading-ios { .loading-ios {
font-family: $loading-ios-font-family;
font-size: $loading-ios-font-size; font-size: $loading-ios-font-size;
} }

3
core/src/components/loading/loading.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Loading Indicator // 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 /// @prop - Font size of the loading wrapper
$loading-ios-font-size: 14px !default; $loading-ios-font-size: 14px !default;

1
core/src/components/loading/loading.md.scss
View File

@ -5,7 +5,6 @@
// -------------------------------------------------- // --------------------------------------------------
.loading-md { .loading-md {
font-family: $loading-md-font-family;
font-size: $loading-md-font-size; font-size: $loading-md-font-size;
} }

3
core/src/components/loading/loading.md.vars.scss
View File

@ -3,9 +3,6 @@
// Material Design Loading Indicator // 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 /// @prop - Font size of the loading wrapper
$loading-md-font-size: 14px !default; $loading-md-font-size: 14px !default;

2
core/src/components/loading/loading.scss
View File

@ -13,6 +13,8 @@ ion-loading {
align-items: center; align-items: center;
justify-content: center; justify-content: center;
font-family: $font-family-base;
contain: strict; contain: strict;
touch-action: none; touch-action: none;
user-select: none; user-select: none;

2
core/src/components/note/note.ios.scss
View File

@ -6,6 +6,4 @@
:host { :host {
--ion-color-base: #{$note-ios-color}; --ion-color-base: #{$note-ios-color};
font-family: $note-ios-font-family;
} }

3
core/src/components/note/note.ios.vars.scss
View File

@ -3,8 +3,5 @@
// iOS Note // iOS Note
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the note
$note-ios-font-family: $font-family-base !default;
/// @prop - Text color of the note /// @prop - Text color of the note
$note-ios-color: $text-color-step-650 !default; $note-ios-color: $text-color-step-650 !default;

2
core/src/components/note/note.md.scss
View File

@ -6,6 +6,4 @@
:host { :host {
--ion-color-base: #{$note-md-color}; --ion-color-base: #{$note-md-color};
font-family: $note-md-font-family;
} }

3
core/src/components/note/note.md.vars.scss
View File

@ -3,8 +3,5 @@
// Material Design Note // Material Design Note
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the note
$note-md-font-family: $font-family-base !default;
/// @prop - Text color of the note /// @prop - Text color of the note
$note-md-color: $text-color-step-800 !default; $note-md-color: $text-color-step-800 !default;

2
core/src/components/note/note.scss
View File

@ -5,4 +5,6 @@
:host { :host {
color: #{current-color(base)}; color: #{current-color(base)};
font-family: $font-family-base;
} }

4
core/src/components/picker/picker.ios.scss
View File

@ -4,10 +4,6 @@
// iOS Picker // iOS Picker
// -------------------------------------------------- // --------------------------------------------------
.picker-ios {
font-family: $picker-ios-font-family;
}
.picker-ios .picker-wrapper { .picker-ios .picker-wrapper {
height: $picker-ios-height; height: $picker-ios-height;

3
core/src/components/picker/picker.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Picker // iOS Picker
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the picker
$picker-ios-font-family: $font-family-base !default;
/// @prop - Height of the picker wrapper /// @prop - Height of the picker wrapper
$picker-ios-height: 260px !default; $picker-ios-height: 260px !default;

4
core/src/components/picker/picker.md.scss
View File

@ -4,10 +4,6 @@
// Material Design Picker // Material Design Picker
// -------------------------------------------------- // --------------------------------------------------
.picker-md {
font-family: $picker-md-font-family;
}
.picker-md .picker-wrapper { .picker-md .picker-wrapper {
height: $picker-md-height; height: $picker-md-height;

3
core/src/components/picker/picker.md.vars.scss
View File

@ -3,9 +3,6 @@
// Material Design Picker // Material Design Picker
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the picker
$picker-md-font-family: $font-family-base !default;
/// @prop - Height of the picker wrapper /// @prop - Height of the picker wrapper
$picker-md-height: 260px !default; $picker-md-height: 260px !default;

2
core/src/components/picker/picker.scss
View File

@ -13,6 +13,8 @@ ion-picker {
width: $picker-width; width: $picker-width;
height: $picker-width; height: $picker-width;
font-family: $font-family-base;
contain: strict; contain: strict;
user-select: none; user-select: none;
z-index: $z-index-overlay; z-index: $z-index-overlay;

2
core/src/components/range/range.ios.scss
View File

@ -14,8 +14,6 @@
--height: #{$range-ios-slider-height}; --height: #{$range-ios-slider-height};
@include padding($range-ios-padding-vertical, $range-ios-padding-horizontal); @include padding($range-ios-padding-vertical, $range-ios-padding-horizontal);
font-family: $range-ios-font-family;
} }

3
core/src/components/range/range.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Range // iOS Range
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Padding top/bottom of the range
$range-ios-font-family: $font-family-base !default;
/// @prop - Padding top/bottom of the range /// @prop - Padding top/bottom of the range
$range-ios-padding-vertical: 8px !default; $range-ios-padding-vertical: 8px !default;

1
core/src/components/range/range.md.scss
View File

@ -15,7 +15,6 @@
@include padding($range-md-padding-vertical, $range-md-padding-horizontal); @include padding($range-md-padding-vertical, $range-md-padding-horizontal);
font-family: $range-md-font-family;
font-size: $range-md-pin-font-size; font-size: $range-md-pin-font-size;
} }

3
core/src/components/range/range.md.vars.scss
View File

@ -3,9 +3,6 @@
// Material Design Range // Material Design Range
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the range
$range-md-font-family: $font-family-base !default;
/// @prop - Padding top/bottom of the range /// @prop - Padding top/bottom of the range
$range-md-padding-vertical: 8px !default; $range-md-padding-vertical: 8px !default;

2
core/src/components/range/range.scss
View File

@ -14,6 +14,8 @@
flex: 1; flex: 1;
align-items: center; align-items: center;
font-family: $font-family-base;
user-select: none; user-select: none;
} }

2
core/src/components/searchbar/searchbar.ios.scss
View File

@ -16,8 +16,6 @@
color: $searchbar-ios-input-text-color; color: $searchbar-ios-input-text-color;
font-family: $searchbar-ios-font-family;
contain: strict; contain: strict;
} }

3
core/src/components/searchbar/searchbar.ios.vars.scss
View File

@ -15,9 +15,6 @@ $searchbar-ios-padding-bottom: $searchbar-ios-padding-top !de
/// @prop - Padding start of the searchbar /// @prop - Padding start of the searchbar
$searchbar-ios-padding-start: $searchbar-ios-padding-end !default; $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 /// @prop - Font size of the searchbar cancel button
$searchbar-ios-cancel-button-font-size: 16px !default; $searchbar-ios-cancel-button-font-size: 16px !default;

2
core/src/components/searchbar/searchbar.md.scss
View File

@ -15,8 +15,6 @@
background: $searchbar-md-background; background: $searchbar-md-background;
color: $searchbar-md-input-text-color; color: $searchbar-md-input-text-color;
font-family: $searchbar-md-font-family;
} }

3
core/src/components/searchbar/searchbar.md.vars.scss
View File

@ -15,9 +15,6 @@ $searchbar-md-padding-bottom: $searchbar-md-padding-top !defa
/// @prop - Padding start of the searchbar /// @prop - Padding start of the searchbar
$searchbar-md-padding-start: $searchbar-md-padding-end !default; $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 /// @prop - Background of the searchbar
$searchbar-md-background: inherit !default; $searchbar-md-background: inherit !default;

2
core/src/components/searchbar/searchbar.scss
View File

@ -17,6 +17,8 @@
width: 100%; width: 100%;
box-sizing: border-box; box-sizing: border-box;
font-family: $font-family-base;
} }
:host(.ion-color) { :host(.ion-color) {

2
core/src/components/segment/segment.ios.scss
View File

@ -13,8 +13,6 @@
--color: #{ion-color(primary, base)}; --color: #{ion-color(primary, base)};
--color-checked: #{ion-color(primary, contrast)}; --color-checked: #{ion-color(primary, contrast)};
--color-disabled: #{ion-color(primary, base, $segment-button-ios-opacity-disabled)}; --color-disabled: #{ion-color(primary, base, $segment-button-ios-opacity-disabled)};
font-family: $segment-ios-font-family;
} }
:host(.segment-disabled) { :host(.segment-disabled) {

3
core/src/components/segment/segment.ios.vars.scss
View File

@ -3,9 +3,6 @@
// iOS Segment // iOS Segment
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Background of the segment button
$segment-ios-font-family: $font-family-base !default;
/// @prop - Opacity of the disabled segment /// @prop - Opacity of the disabled segment
$segment-ios-opacity-disabled: .4 !default; $segment-ios-opacity-disabled: .4 !default;

2
core/src/components/segment/segment.md.scss
View File

@ -10,8 +10,6 @@
--border-color: #{$segment-button-md-border-bottom-color}; --border-color: #{$segment-button-md-border-bottom-color};
--color: #{$segment-button-md-text-color}; --color: #{$segment-button-md-text-color};
--color-checked: #{$segment-button-md-text-color}; --color-checked: #{$segment-button-md-text-color};
font-family: $segment-md-font-family;
} }
:host(.segment-disabled) { :host(.segment-disabled) {

3
core/src/components/segment/segment.md.vars.scss
View File

@ -3,9 +3,6 @@
// Material Design Segment // Material Design Segment
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Background of the segment button
$segment-md-font-family: $font-family-base !default;
/// @prop - Opacity of the disabled segment /// @prop - Opacity of the disabled segment
$segment-md-opacity-disabled: .3 !default; $segment-md-opacity-disabled: .3 !default;

2
core/src/components/segment/segment.scss
View File

@ -25,6 +25,8 @@
width: 100%; width: 100%;
font-family: $font-family-base;
text-align: center; text-align: center;
} }

4
core/src/components/select/select.ios.scss
View File

@ -12,10 +12,6 @@
--padding-bottom: #{$select-ios-padding-bottom}; --padding-bottom: #{$select-ios-padding-bottom};
--padding-start: #{$select-ios-padding-start}; --padding-start: #{$select-ios-padding-start};
--placeholder-color: #{$select-ios-placeholder-color}; --placeholder-color: #{$select-ios-placeholder-color};
color: var(--color);
font-family: $select-ios-font-family;
} }
.select-placeholder { .select-placeholder {

3
core/src/components/select/select.ios.vars.scss
View File

@ -16,9 +16,6 @@ $select-ios-padding-bottom: $item-ios-padding-bottom !default;
/// @prop - Padding start of the select /// @prop - Padding start of the select
$select-ios-padding-start: $item-ios-padding-start !default; $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 /// @prop - Color of the select icon
$select-ios-icon-color: $text-color-step-650 !default; $select-ios-icon-color: $text-color-step-650 !default;

4
core/src/components/select/select.md.scss
View File

@ -12,10 +12,6 @@
--padding-bottom: #{$select-md-padding-bottom}; --padding-bottom: #{$select-md-padding-bottom};
--padding-start: #{$select-md-padding-start}; --padding-start: #{$select-md-padding-start};
--placeholder-color: #{$select-md-placeholder-color}; --placeholder-color: #{$select-md-placeholder-color};
color: var(--color);
font-family: $select-md-font-family;
} }
.select-placeholder { .select-placeholder {

3
core/src/components/select/select.md.vars.scss
View File

@ -16,9 +16,6 @@ $select-md-padding-bottom: $item-md-padding-bottom !default;
/// @prop - Padding start of the select /// @prop - Padding start of the select
$select-md-padding-start: $item-md-padding-start !default; $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 /// @prop - Color of the select icon
$select-md-icon-color: $text-color-step-600 !default; $select-md-icon-color: $text-color-step-600 !default;

4
core/src/components/select/select.scss
View File

@ -18,6 +18,10 @@
display: flex; display: flex;
color: var(--color);
font-family: $font-family-base;
overflow: hidden; overflow: hidden;
} }

1
core/src/components/textarea/textarea.ios.scss
View File

@ -10,6 +10,5 @@
--padding-bottom: #{$textarea-ios-padding-bottom}; --padding-bottom: #{$textarea-ios-padding-bottom};
--padding-start: #{$textarea-ios-padding-start}; --padding-start: #{$textarea-ios-padding-start};
font-family: $textarea-ios-font-family;
font-size: $textarea-ios-font-size; font-size: $textarea-ios-font-size;
} }

3
core/src/components/textarea/textarea.ios.vars.scss
View File

@ -7,9 +7,6 @@
/// @prop - Margin start of the textarea when it is after a label /// @prop - Margin start of the textarea when it is after a label
$textarea-ios-by-label-margin-start: $item-ios-padding-start !default; $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 /// @prop - Font size of the textarea
$textarea-ios-font-size: inherit !default; $textarea-ios-font-size: inherit !default;

1
core/src/components/textarea/textarea.md.scss
View File

@ -10,6 +10,5 @@
--padding-bottom: #{$textarea-md-padding-bottom}; --padding-bottom: #{$textarea-md-padding-bottom};
--padding-start: #{$textarea-md-padding-start}; --padding-start: #{$textarea-md-padding-start};
font-family: $textarea-md-font-family;
font-size: $textarea-md-font-size; font-size: $textarea-md-font-size;
} }

3
core/src/components/textarea/textarea.md.vars.scss
View File

@ -4,9 +4,6 @@
// Material Design Textarea // Material Design Textarea
// -------------------------------------------------- // --------------------------------------------------
/// @prop - Font family of the textarea
$textarea-md-font-family: $font-family-base !default;
/// @prop - Font size of the textarea /// @prop - Font size of the textarea
$textarea-md-font-size: inherit !default; $textarea-md-font-size: inherit !default;

2
core/src/components/textarea/textarea.scss
View File

@ -37,6 +37,8 @@
background: var(--background); background: var(--background);
color: var(--color); color: var(--color);
font-family: $font-family-base;
} }
:host(.ion-color) { :host(.ion-color) {

1
core/src/components/toast/toast.ios.scss
View File

@ -9,7 +9,6 @@
--button-color: #{$toast-ios-button-color}; --button-color: #{$toast-ios-button-color};
--color: #{$toast-ios-title-color}; --color: #{$toast-ios-title-color};
font-family: $toast-ios-font-family;
font-size: $toast-ios-title-font-size; font-size: $toast-ios-title-font-size;
} }

Some files were not shown because too many files have changed in this diff Show More