From 2a98e3aa098d29d0d4d0e31c60b61e4ff76565e3 Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Wed, 7 Feb 2018 18:48:32 -0500 Subject: [PATCH] style(sass): fix lint errors and update slides file to ignore --- packages/core/.scss-lint.yml | 2 +- packages/core/src/components/alert/alert.scss | 17 ++++++++--------- .../components/back-button/back-button.ios.scss | 1 - .../src/components/back-button/back-button.scss | 6 +++--- .../src/components/chip-button/chip-button.scss | 6 +++--- .../src/components/fab-button/fab-button.scss | 8 +++----- .../src/components/searchbar/searchbar.ios.scss | 4 ++-- .../src/components/searchbar/searchbar.md.scss | 6 +++--- .../src/components/searchbar/searchbar.scss | 5 +++-- .../src/components/segment/segment.ios.scss | 2 +- packages/core/src/components/text/text.ios.scss | 1 + packages/core/src/components/text/text.md.scss | 1 + 12 files changed, 29 insertions(+), 30 deletions(-) diff --git a/packages/core/.scss-lint.yml b/packages/core/.scss-lint.yml index 4025723623..3c1d7fa782 100644 --- a/packages/core/.scss-lint.yml +++ b/packages/core/.scss-lint.yml @@ -13,7 +13,7 @@ exclude: - 'src/themes/util.scss' - 'src/themes/version.scss' - 'src/platform/cordova.*.scss' - - 'src/components/slides/slides-import.scss' + - 'src/components/slides/slides-vendor.scss' linters: diff --git a/packages/core/src/components/alert/alert.scss b/packages/core/src/components/alert/alert.scss index 5dfcf53866..4d365c269b 100644 --- a/packages/core/src/components/alert/alert.scss +++ b/packages/core/src/components/alert/alert.scss @@ -54,24 +54,24 @@ ion-alert.alert-top { } .alert-message { - overflow-y: scroll; + box-sizing: border-box; -webkit-overflow-scrolling: touch; - box-sizing: border-box; + overflow-y: scroll; } .alert-input { @include padding(10px, 0); + box-sizing: border-box; + width: 100%; border: 0; - background: inherit; - font: inherit; - box-sizing: border-box; + background: inherit; } .alert-button-group { @@ -117,16 +117,15 @@ ion-alert.alert-top { @include margin(0); @include padding(0); - border: 0; - width: 100%; + border: 0; + font-size: inherit; line-height: initial; background: transparent; } - .alert-button, .alert-checkbox, .alert-input, @@ -141,4 +140,4 @@ ion-alert.alert-top { .alert-checkbox-icon, .alert-checkbox-inner { box-sizing: border-box; -} \ No newline at end of file +} diff --git a/packages/core/src/components/back-button/back-button.ios.scss b/packages/core/src/components/back-button/back-button.ios.scss index 53046d3a40..c1221f8eac 100644 --- a/packages/core/src/components/back-button/back-button.ios.scss +++ b/packages/core/src/components/back-button/back-button.ios.scss @@ -3,4 +3,3 @@ // iOS Back Button // -------------------------------------------------- -body {color:red;} \ No newline at end of file diff --git a/packages/core/src/components/back-button/back-button.scss b/packages/core/src/components/back-button/back-button.scss index 75dac8ec55..a0eba3a845 100644 --- a/packages/core/src/components/back-button/back-button.scss +++ b/packages/core/src/components/back-button/back-button.scss @@ -2,9 +2,9 @@ // Back Button // -------------------------------------------------- -.back-button { - display: none; -} +// .back-button { +// display: none; +// } // .back-button.show-back-button { .back-button { diff --git a/packages/core/src/components/chip-button/chip-button.scss b/packages/core/src/components/chip-button/chip-button.scss index 209fb10f26..f38381cea3 100644 --- a/packages/core/src/components/chip-button/chip-button.scss +++ b/packages/core/src/components/chip-button/chip-button.scss @@ -9,11 +9,11 @@ position: relative; - border: 0; - width: $chip-button-size; height: $chip-button-size; + border: 0; + &:active, &:focus { outline: none; @@ -30,4 +30,4 @@ width: 100%; height: 100%; -} \ No newline at end of file +} diff --git a/packages/core/src/components/fab-button/fab-button.scss b/packages/core/src/components/fab-button/fab-button.scss index 4fe327e985..4f54844b85 100755 --- a/packages/core/src/components/fab-button/fab-button.scss +++ b/packages/core/src/components/fab-button/fab-button.scss @@ -53,6 +53,9 @@ width: 100%; height: 100%; + + transition: all ease-in-out 300ms; + transition-property: transform, opacity; } @@ -93,11 +96,6 @@ ion-fab-button[mini] .fab-button { // FAB Animation // -------------------------------------------------- -.fab-button-inner { - transition: all ease-in-out 300ms; - transition-property: transform, opacity; -} - .fab-button-close-active .fab-button-close-icon { opacity: 1; transform: scale(1) rotateZ(0deg); diff --git a/packages/core/src/components/searchbar/searchbar.ios.scss b/packages/core/src/components/searchbar/searchbar.ios.scss index 556c3eda03..e68bfdebc9 100644 --- a/packages/core/src/components/searchbar/searchbar.ios.scss +++ b/packages/core/src/components/searchbar/searchbar.ios.scss @@ -85,12 +85,12 @@ .searchbar-cancel-button-ios { @include padding(0, 0, 0, 8px); - font-size: $searchbar-ios-cancel-button-font-size; - display: none; flex-shrink: 0; + font-size: $searchbar-ios-cancel-button-font-size; + color: $searchbar-ios-cancel-button-color; background-color: $searchbar-ios-cancel-button-background-color; diff --git a/packages/core/src/components/searchbar/searchbar.md.scss b/packages/core/src/components/searchbar/searchbar.md.scss index dbb76669be..2e0fd4cc72 100644 --- a/packages/core/src/components/searchbar/searchbar.md.scss +++ b/packages/core/src/components/searchbar/searchbar.md.scss @@ -34,12 +34,12 @@ display: none; - background-color: $searchbar-md-cancel-button-background-color; - color: $searchbar-md-cancel-button-color; + height: 100%; font-size: $searchbar-md-cancel-button-font-size; - height: 100%; + color: $searchbar-md-cancel-button-color; + background-color: $searchbar-md-cancel-button-background-color; } // Searchbar Search & Cancel Icon diff --git a/packages/core/src/components/searchbar/searchbar.scss b/packages/core/src/components/searchbar/searchbar.scss index 92fb5b4e7a..44173287ce 100644 --- a/packages/core/src/components/searchbar/searchbar.scss +++ b/packages/core/src/components/searchbar/searchbar.scss @@ -30,6 +30,9 @@ ion-searchbar { .searchbar-input { @include appearance(none); + + box-sizing: border-box; + display: block; width: 100%; @@ -37,8 +40,6 @@ ion-searchbar { border: 0; font-family: inherit; - box-sizing: border-box; - &:active, &:focus { outline: none; diff --git a/packages/core/src/components/segment/segment.ios.scss b/packages/core/src/components/segment/segment.ios.scss index ab4c3065af..9e092a6962 100644 --- a/packages/core/src/components/segment/segment.ios.scss +++ b/packages/core/src/components/segment/segment.ios.scss @@ -22,4 +22,4 @@ @include position(0, 0, 0, 0); position: absolute; -} \ No newline at end of file +} diff --git a/packages/core/src/components/text/text.ios.scss b/packages/core/src/components/text/text.ios.scss index 58c8c1512e..44185d70a9 100644 --- a/packages/core/src/components/text/text.ios.scss +++ b/packages/core/src/components/text/text.ios.scss @@ -11,6 +11,7 @@ .text-ios-#{$color-name}, .text-ios-#{$color-name} a, .text-ios-#{$color-name} p { + // scss-lint:disable ImportantRule color: $color-base !important; } diff --git a/packages/core/src/components/text/text.md.scss b/packages/core/src/components/text/text.md.scss index 050af1ad11..f3b88758a9 100644 --- a/packages/core/src/components/text/text.md.scss +++ b/packages/core/src/components/text/text.md.scss @@ -11,6 +11,7 @@ .text-md-#{$color-name}, .text-md-#{$color-name} a, .text-md-#{$color-name} p { + // scss-lint:disable ImportantRule color: $color-base !important; }