javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(lint): fix lint errors and add !default flags

Browse Source
This commit is contained in:
Brandy Carney
2017-06-09 18:11:40 -04:00
parent 10f4df42d0
commit 63b0f0aaf6
11 changed files with 42 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
.scss-linters/default_rule.rb
View File

@@ -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')

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

@@ -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;
}

6
src/components/split-pane/split-pane.ios.scss
View File

@@ -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;

6
src/components/split-pane/split-pane.md.scss
View File

@@ -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;

6
src/components/split-pane/split-pane.wp.scss
View File

@@ -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;

2
src/components/toolbar/toolbar.ios.scss
View File

@@ -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;

2
src/components/toolbar/toolbar.md.scss
View File

@@ -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;

2
src/components/toolbar/toolbar.wp.scss
View File

@@ -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;

2
src/themes/ionic.build.dark.scss
View File

@@ -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";

2
src/themes/ionic.build.default.scss
View File

@@ -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";

26
src/themes/ionic.globals.scss
View File

@@ -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