diff --git a/packages/core/.sass-lint.yml b/packages/core/.sass-lint.yml index 89f52e75fa..25ae045721 100644 --- a/packages/core/.sass-lint.yml +++ b/packages/core/.sass-lint.yml @@ -62,9 +62,12 @@ rules: # Box + - box-sizing - position - top + - right - bottom + - left - z-index - display - overflow @@ -134,10 +137,13 @@ rules: - font - font-family - font-size - - font-smoothing + - -moz-osx-font-smoothing + - -webkit-font-smoothing + - font-smooth - font-style - font-variant - font-weight + - src - letter-spacing - line-height diff --git a/packages/core/.scss-lint.yml b/packages/core/.scss-lint.yml index 4ef73cd0d8..4025723623 100644 --- a/packages/core/.scss-lint.yml +++ b/packages/core/.scss-lint.yml @@ -39,9 +39,12 @@ linters: # Box + - box-sizing - position - top + - right - bottom + - left - z-index - display - overflow @@ -111,10 +114,13 @@ linters: - font - font-family - font-size - - font-smoothing + - -moz-osx-font-smoothing + - -webkit-font-smoothing + - font-smooth - font-style - font-variant - font-weight + - src - letter-spacing - line-height diff --git a/packages/core/src/components/app/app.scss b/packages/core/src/components/app/app.scss index d6e71692ce..20f8879d53 100644 --- a/packages/core/src/components/app/app.scss +++ b/packages/core/src/components/app/app.scss @@ -39,8 +39,8 @@ body { height: 100%; max-height: 100%; + -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - font-smoothing: antialiased; text-rendering: optimizeLegibility; diff --git a/packages/core/src/components/app/fonts/ionicons.scss b/packages/core/src/components/app/fonts/ionicons.scss index 436a309139..606cf34721 100644 --- a/packages/core/src/components/app/fonts/ionicons.scss +++ b/packages/core/src/components/app/fonts/ionicons.scss @@ -12,11 +12,11 @@ $ionicons-font-path: $font-path !default; @font-face { font-family: "Ionicons"; + font-style: normal; + font-weight: normal; src: url("#{$ionicons-font-path}/ionicons.woff2?v=#{$ionicons-version}") format("woff2"), url("#{$ionicons-font-path}/ionicons.woff?v=#{$ionicons-version}") format("woff"), url("#{$ionicons-font-path}/ionicons.ttf?v=#{$ionicons-version}") format("truetype"); - font-weight: normal; - font-style: normal; } ion-icon { diff --git a/packages/core/src/components/button/button.ios.scss b/packages/core/src/components/button/button.ios.scss index 76e97a4529..9bfda01e69 100644 --- a/packages/core/src/components/button/button.ios.scss +++ b/packages/core/src/components/button/button.ios.scss @@ -123,8 +123,8 @@ } .button-outline-ios.activated.focused { - background-color: color-shade($button-ios-background-color, 12%); border-color: color-shade($button-ios-background-color, 12%); + background-color: color-shade($button-ios-background-color, 12%); } // iOS Outline Button Color Mixin @@ -149,8 +149,8 @@ } .button-outline-ios-#{$color-name}.activated.focused { - background-color: color-shade($color-base, 12%); border-color: color-shade($color-base, 12%); + background-color: color-shade($color-base, 12%); } } diff --git a/packages/core/src/components/chip/chip.scss b/packages/core/src/components/chip/chip.scss index 0c7096895d..c919fb1bee 100644 --- a/packages/core/src/components/chip/chip.scss +++ b/packages/core/src/components/chip/chip.scss @@ -4,14 +4,13 @@ // -------------------------------------------------- ion-chip { + box-sizing: border-box; display: inline-flex; align-self: center; font-weight: normal; vertical-align: middle; - - box-sizing: border-box; } ion-chip ion-icon { diff --git a/packages/core/src/components/item-sliding/item-sliding.scss b/packages/core/src/components/item-sliding/item-sliding.scss index 48995f1bff..c11d4efdb5 100644 --- a/packages/core/src/components/item-sliding/item-sliding.scss +++ b/packages/core/src/components/item-sliding/item-sliding.scss @@ -37,11 +37,11 @@ ion-item-options { justify-content: flex-start; &:not([side=right]) { - justify-content: flex-end; - // scss-lint:disable PropertySpelling right: auto; left: 0; + + justify-content: flex-end; } } } diff --git a/packages/core/src/components/picker/picker.scss b/packages/core/src/components/picker/picker.scss index 6c70496c7d..ef17727ac9 100644 --- a/packages/core/src/components/picker/picker.scss +++ b/packages/core/src/components/picker/picker.scss @@ -63,6 +63,7 @@ ion-picker { } .picker-col { + box-sizing: content-box; position: relative; display: flex; @@ -71,8 +72,6 @@ ion-picker { height: 100%; - box-sizing: content-box; - contain: content; } diff --git a/packages/core/src/components/slide/slide.scss b/packages/core/src/components/slide/slide.scss index ec7b9b620e..3f394dbc06 100644 --- a/packages/core/src/components/slide/slide.scss +++ b/packages/core/src/components/slide/slide.scss @@ -22,6 +22,7 @@ ion-slide { .swiper-slide { @include text-align(center); + box-sizing: border-box; position: relative; // Center slide text vertically @@ -36,8 +37,6 @@ ion-slide { height: 100%; font-size: 18px; - - box-sizing: border-box; } .swiper-slide img { diff --git a/packages/core/src/components/toggle/toggle.ios.scss b/packages/core/src/components/toggle/toggle.ios.scss index 15dde737cc..646e1378ec 100644 --- a/packages/core/src/components/toggle/toggle.ios.scss +++ b/packages/core/src/components/toggle/toggle.ios.scss @@ -5,13 +5,12 @@ // ----------------------------------------- .toggle-ios { + box-sizing: content-box; position: relative; width: $toggle-ios-width; height: $toggle-ios-height; - box-sizing: content-box; - contain: strict; } diff --git a/packages/core/src/components/toggle/toggle.md.scss b/packages/core/src/components/toggle/toggle.md.scss index 5347719ed6..7d3c94057f 100644 --- a/packages/core/src/components/toggle/toggle.md.scss +++ b/packages/core/src/components/toggle/toggle.md.scss @@ -5,6 +5,8 @@ // ----------------------------------------- .toggle-md { + box-sizing: content-box; + @include padding($toggle-md-padding-top, $toggle-md-padding-end, $toggle-md-padding-bottom, $toggle-md-padding-start); position: relative; @@ -12,8 +14,6 @@ width: $toggle-md-track-width; height: $toggle-md-track-height; - box-sizing: content-box; - contain: strict; }