From 63b0f0aaf637899789e75107e26743cbc148c9bf Mon Sep 17 00:00:00 2001 From: Brandy Carney Date: Fri, 9 Jun 2017 18:11:40 -0400 Subject: [PATCH] style(lint): fix lint errors and add !default flags --- .scss-linters/default_rule.rb | 14 +++++++++- src/components/picker/picker.scss | 2 ++ src/components/split-pane/split-pane.ios.scss | 6 ++--- src/components/split-pane/split-pane.md.scss | 6 ++--- src/components/split-pane/split-pane.wp.scss | 6 ++--- src/components/toolbar/toolbar.ios.scss | 2 +- src/components/toolbar/toolbar.md.scss | 2 +- src/components/toolbar/toolbar.wp.scss | 2 +- src/themes/ionic.build.dark.scss | 2 +- src/themes/ionic.build.default.scss | 2 +- src/themes/ionic.globals.scss | 26 +++++++++---------- 11 files changed, 42 insertions(+), 28 deletions(-) diff --git a/.scss-linters/default_rule.rb b/.scss-linters/default_rule.rb index 7e13b15b26..61243be106 100644 --- a/.scss-linters/default_rule.rb +++ b/.scss-linters/default_rule.rb @@ -1,8 +1,20 @@ module SCSSLint - # Reports the use of !important in properties. + # Reports the use of !default at the end of variable declarations. class Linter::DefaultRule < Linter include LinterRegistry + def visit_each(node) + return true + end + + def visit_function(node) + return true + end + + def visit_mixin(node) + return true + end + def visit_variable(node) return if source_from_range(node.source_range).include?('!default') diff --git a/src/components/picker/picker.scss b/src/components/picker/picker.scss index ab3d845325..bf41d3b628 100644 --- a/src/components/picker/picker.scss +++ b/src/components/picker/picker.scss @@ -145,6 +145,7 @@ ion-picker-cmp { @include ltr() { justify-content: flex-start; } + @include rtl() { justify-content: flex-end; } @@ -154,6 +155,7 @@ ion-picker-cmp { @include ltr() { justify-content: flex-end; } + @include rtl() { justify-content: flex-start; } diff --git a/src/components/split-pane/split-pane.ios.scss b/src/components/split-pane/split-pane.ios.scss index b9cc68958c..eeb105a820 100644 --- a/src/components/split-pane/split-pane.ios.scss +++ b/src/components/split-pane/split-pane.ios.scss @@ -5,13 +5,13 @@ // -------------------------------------------------- /// @prop - Minimum width of the split-pane's side pane -$split-pane-ios-side-min-width: $split-pane-side-min-width; +$split-pane-ios-side-min-width: $split-pane-side-min-width !default; /// @prop - Maximum width of the split-pane's side pane -$split-pane-ios-side-max-width: $split-pane-side-max-width; +$split-pane-ios-side-max-width: $split-pane-side-max-width !default; /// @prop - Border style of the side pane -$split-pane-ios-border: $hairlines-width solid $list-ios-border-color; +$split-pane-ios-border: $hairlines-width solid $list-ios-border-color !default; .split-pane-ios.split-pane-visible >.split-pane-side { min-width: $split-pane-ios-side-min-width; diff --git a/src/components/split-pane/split-pane.md.scss b/src/components/split-pane/split-pane.md.scss index 087e2e5188..c5ba59166a 100644 --- a/src/components/split-pane/split-pane.md.scss +++ b/src/components/split-pane/split-pane.md.scss @@ -5,13 +5,13 @@ // -------------------------------------------------- /// @prop - Minimum width of the split-pane's side pane -$split-pane-md-side-min-width: $split-pane-side-min-width; +$split-pane-md-side-min-width: $split-pane-side-min-width !default; /// @prop - Maximum width of the split-pane's side pane -$split-pane-md-side-max-width: $split-pane-side-max-width; +$split-pane-md-side-max-width: $split-pane-side-max-width !default; /// @prop - Border style of the side pane -$split-pane-md-border: 1px solid $list-md-border-color; +$split-pane-md-border: 1px solid $list-md-border-color !default; .split-pane-md.split-pane-visible >.split-pane-side { min-width: $split-pane-md-side-min-width; diff --git a/src/components/split-pane/split-pane.wp.scss b/src/components/split-pane/split-pane.wp.scss index 287a2d150f..1a6c5bdd75 100644 --- a/src/components/split-pane/split-pane.wp.scss +++ b/src/components/split-pane/split-pane.wp.scss @@ -5,13 +5,13 @@ // -------------------------------------------------- /// @prop - Minimum width of the split-pane's side pane -$split-pane-wp-side-min-width: $split-pane-side-min-width; +$split-pane-wp-side-min-width: $split-pane-side-min-width !default; /// @prop - Maximum width of the split-pane's side pane -$split-pane-wp-side-max-width: $split-pane-side-max-width; +$split-pane-wp-side-max-width: $split-pane-side-max-width !default; /// @prop - Border style of the side pane -$split-pane-wp-border: 1px solid $list-wp-border-color; +$split-pane-wp-border: 1px solid $list-wp-border-color !default; .split-pane-wp.split-pane-visible >.split-pane-side { min-width: $split-pane-wp-side-min-width; diff --git a/src/components/toolbar/toolbar.ios.scss b/src/components/toolbar/toolbar.ios.scss index 1d4d810a45..488e4ff220 100644 --- a/src/components/toolbar/toolbar.ios.scss +++ b/src/components/toolbar/toolbar.ios.scss @@ -13,7 +13,7 @@ $toolbar-order-ios: ( buttons-end: 5, buttons-right: 6, menu-toggle-end: 7, -); +) !default; /// @prop - Font size of the toolbar button $toolbar-ios-button-font-size: 1.7rem !default; diff --git a/src/components/toolbar/toolbar.md.scss b/src/components/toolbar/toolbar.md.scss index de3d1ee98d..dc2c9c447f 100644 --- a/src/components/toolbar/toolbar.md.scss +++ b/src/components/toolbar/toolbar.md.scss @@ -13,7 +13,7 @@ $toolbar-order-md: ( buttons-end: 5, buttons-right: 6, menu-toggle-end: 7, -); +) !default; /// @prop - Font size of the toolbar title $toolbar-md-title-font-size: 2rem !default; diff --git a/src/components/toolbar/toolbar.wp.scss b/src/components/toolbar/toolbar.wp.scss index b81b46e7d4..07288b77ee 100644 --- a/src/components/toolbar/toolbar.wp.scss +++ b/src/components/toolbar/toolbar.wp.scss @@ -13,7 +13,7 @@ $toolbar-order-wp: ( buttons-end: 5, buttons-right: 6, menu-toggle-end: 7, -); +) !default; // deprecated $toolbar-wp-title-padding: null !default; diff --git a/src/themes/ionic.build.dark.scss b/src/themes/ionic.build.dark.scss index c2826715d9..86f827afe3 100644 --- a/src/themes/ionic.build.dark.scss +++ b/src/themes/ionic.build.dark.scss @@ -1,5 +1,5 @@ @charset "UTF-8"; -$ionic-theme: "Dark"; +$ionic-theme: "Dark"; // scss-lint:disable DefaultRule @import "./version"; @import "./license"; @import "./ionic.theme.dark"; diff --git a/src/themes/ionic.build.default.scss b/src/themes/ionic.build.default.scss index a2b57b258e..990f8ec9b8 100755 --- a/src/themes/ionic.build.default.scss +++ b/src/themes/ionic.build.default.scss @@ -1,5 +1,5 @@ @charset "UTF-8"; -$ionic-theme: "Default"; +$ionic-theme: "Default"; // scss-lint:disable DefaultRule @import "./version"; @import "./license"; @import "./ionic.theme.default"; diff --git a/src/themes/ionic.globals.scss b/src/themes/ionic.globals.scss index c6729e1ac8..50629a8534 100644 --- a/src/themes/ionic.globals.scss +++ b/src/themes/ionic.globals.scss @@ -31,20 +31,20 @@ $hairlines-width: .55px !default; // -------------------------------------------------- // Grouped by elements which would be siblings -$z-index-menu-overlay: 80; -$z-index-overlay: 1000; -$z-index-click-block: 99999; +$z-index-menu-overlay: 80; // scss-lint:disable DefaultRule +$z-index-overlay: 1000; // scss-lint:disable DefaultRule +$z-index-click-block: 99999; // scss-lint:disable DefaultRule -$z-index-fixed-content: 999; -$z-index-scroll-content: 1; -$z-index-refresher: 0; +$z-index-fixed-content: 999; // scss-lint:disable DefaultRule +$z-index-scroll-content: 1; // scss-lint:disable DefaultRule +$z-index-refresher: 0; // scss-lint:disable DefaultRule -$z-index-page-container: 0; -$z-index-toolbar: 10; -$z-index-toolbar-background: -1; +$z-index-page-container: 0; // scss-lint:disable DefaultRule +$z-index-toolbar: 10; // scss-lint:disable DefaultRule +$z-index-toolbar-background: -1; // scss-lint:disable DefaultRule -$z-index-backdrop: 2; -$z-index-overlay-wrapper: 10; +$z-index-backdrop: 2; // scss-lint:disable DefaultRule +$z-index-overlay-wrapper: 10; // scss-lint:disable DefaultRule -$z-index-item-options: 1; -$z-index-item-divider: 100; +$z-index-item-options: 1; // scss-lint:disable DefaultRule +$z-index-item-divider: 100; // scss-lint:disable DefaultRule