From cc9df62b0b41e84da275cf6ddcb06126628713b7 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Thu, 4 Jan 2018 18:23:23 -0500 Subject: [PATCH] style(sass): fix lint errors --- packages/core/src/components/app/app.scss | 12 +++++------- .../core/src/components/app/fonts/ionicons.scss | 5 +++-- .../src/components/datetime/datetime.vars.scss | 2 +- packages/core/src/components/nav/nav.scss | 14 ++++---------- packages/core/src/components/page/page.scss | 7 ++----- .../core/src/components/reorder/reorder.vars.scss | 2 +- packages/core/src/components/tabs/tabs.md.scss | 4 +++- packages/core/src/components/tabs/tabs.scss | 11 +++++------ packages/core/src/components/toggle/toggle.md.scss | 4 ++-- 9 files changed, 26 insertions(+), 35 deletions(-) diff --git a/packages/core/src/components/app/app.scss b/packages/core/src/components/app/app.scss index c5f36845e4..e0004daff9 100644 --- a/packages/core/src/components/app/app.scss +++ b/packages/core/src/components/app/app.scss @@ -15,6 +15,7 @@ * { box-sizing: border-box; + -webkit-tap-highlight-color: rgba(0, 0, 0, 0); -webkit-tap-highlight-color: transparent; -webkit-touch-callout: none; @@ -39,11 +40,11 @@ body { height: 100%; max-height: 100%; + text-rendering: optimizeLegibility; + -moz-osx-font-smoothing: grayscale; -webkit-font-smoothing: antialiased; - text-rendering: optimizeLegibility; - -webkit-user-drag: none; -ms-content-zooming: none; @@ -148,12 +149,9 @@ sub { } ion-app { - position: absolute; + @include position(0); - top: 0; - right: 0; - bottom: 0; - left: 0; + position: absolute; z-index: $z-index-page-container; diff --git a/packages/core/src/components/app/fonts/ionicons.scss b/packages/core/src/components/app/fonts/ionicons.scss index 606cf34721..fcf6031eda 100644 --- a/packages/core/src/components/app/fonts/ionicons.scss +++ b/packages/core/src/components/app/fonts/ionicons.scss @@ -23,8 +23,6 @@ ion-icon { display: inline-block; font-family: "Ionicons"; - -moz-osx-font-smoothing: grayscale; - -webkit-font-smoothing: antialiased; font-style: normal; font-variant: normal; font-weight: normal; @@ -33,6 +31,9 @@ ion-icon { text-transform: none; speak: none; + -moz-osx-font-smoothing: grayscale; + -webkit-font-smoothing: antialiased; + @include rtl() { &[aria-label^="arrow"]::before, &[flip-rtl]::before { diff --git a/packages/core/src/components/datetime/datetime.vars.scss b/packages/core/src/components/datetime/datetime.vars.scss index d23950ae31..fd38dfc7a2 100644 --- a/packages/core/src/components/datetime/datetime.vars.scss +++ b/packages/core/src/components/datetime/datetime.vars.scss @@ -13,4 +13,4 @@ $datetime-text-min-height: 1.2em !default; $datetime-text-line-height: 1.2 !default; /// @prop - Opacity of the disabled datetime -$datetime-disabled-opacity: .4 !default; \ No newline at end of file +$datetime-disabled-opacity: .4 !default; diff --git a/packages/core/src/components/nav/nav.scss b/packages/core/src/components/nav/nav.scss index d59144c4b7..5ae2bec48f 100644 --- a/packages/core/src/components/nav/nav.scss +++ b/packages/core/src/components/nav/nav.scss @@ -4,12 +4,9 @@ ion-nav { - position: absolute; + @include position(0); - top: 0; - right: 0; - bottom: 0; - left: 0; + position: absolute; z-index: $z-index-page-container; @@ -20,12 +17,9 @@ ion-nav { } .ion-page { - position: absolute; + @include position(0); - top: 0; - right: 0; - bottom: 0; - left: 0; + position: absolute; z-index: $z-index-page-container; diff --git a/packages/core/src/components/page/page.scss b/packages/core/src/components/page/page.scss index fe0f87dd20..09471d83bf 100644 --- a/packages/core/src/components/page/page.scss +++ b/packages/core/src/components/page/page.scss @@ -4,12 +4,9 @@ ion-page { - position: absolute; + @include position(0); - top: 0; - right: 0; - bottom: 0; - left: 0; + position: absolute; z-index: $z-index-page-container; diff --git a/packages/core/src/components/reorder/reorder.vars.scss b/packages/core/src/components/reorder/reorder.vars.scss index 1eae2cf674..77aca60cb7 100644 --- a/packages/core/src/components/reorder/reorder.vars.scss +++ b/packages/core/src/components/reorder/reorder.vars.scss @@ -4,4 +4,4 @@ // -------------------------------------------------- /// @prop - Transform of the reorder when it isn't visible -$reorder-initial-transform: 160% !default; \ No newline at end of file +$reorder-initial-transform: 160% !default; diff --git a/packages/core/src/components/tabs/tabs.md.scss b/packages/core/src/components/tabs/tabs.md.scss index 239939d99d..8ed5ef6e27 100644 --- a/packages/core/src/components/tabs/tabs.md.scss +++ b/packages/core/src/components/tabs/tabs.md.scss @@ -38,12 +38,14 @@ } .tabbar-md.scrollable ion-scroll { + @include margin(0, 8px); + max-width: 650px; - margin: 0 8px; } .tabbar-md.scrollable ion-tab-button { overflow: hidden; + flex: 1 0 auto; } diff --git a/packages/core/src/components/tabs/tabs.scss b/packages/core/src/components/tabs/tabs.scss index 508b7de7ad..8c021584b9 100644 --- a/packages/core/src/components/tabs/tabs.scss +++ b/packages/core/src/components/tabs/tabs.scss @@ -8,12 +8,9 @@ // -------------------------------------------------- ion-tabs { - position: absolute; + @include position(0); - top: 0; - right: 0; - bottom: 0; - left: 0; + position: absolute; z-index: $z-index-page-container; @@ -79,11 +76,12 @@ ion-tabbar.placement-top { } ion-tab-button { - box-sizing: border-box; @include margin(0); @include text-align(center); @include border-radius(0); + box-sizing: border-box; + position: relative; z-index: 0; display: flex; @@ -228,6 +226,7 @@ ion-tabbar.scrollable ion-scroll { ion-tabbar.scrollable .scroll-inner { position: relative; display: flex; + flex-direction: row; } diff --git a/packages/core/src/components/toggle/toggle.md.scss b/packages/core/src/components/toggle/toggle.md.scss index 7d3c94057f..3ea6df6012 100644 --- a/packages/core/src/components/toggle/toggle.md.scss +++ b/packages/core/src/components/toggle/toggle.md.scss @@ -5,10 +5,10 @@ // ----------------------------------------- .toggle-md { - box-sizing: content-box; - @include padding($toggle-md-padding-top, $toggle-md-padding-end, $toggle-md-padding-bottom, $toggle-md-padding-start); + box-sizing: content-box; + position: relative; width: $toggle-md-track-width;