From 3d404d5a0b0fda7e4d1e9e13c1c7b5c1d6159adf Mon Sep 17 00:00:00 2001 From: Daniel Box Date: Sun, 28 Feb 2016 21:20:25 -0600 Subject: [PATCH] linting tweaks --- .hound.yml | 2 +- .pages | 2 +- .scss-style.yml => .scss-lint.yml | 4 ++-- knapsack/_forms.scss | 2 +- knapsack/_reset.scss | 14 +++++--------- knapsack/_utilities.scss | 6 +++--- package.json | 2 +- 7 files changed, 14 insertions(+), 18 deletions(-) rename .scss-style.yml => .scss-lint.yml (98%) diff --git a/.hound.yml b/.hound.yml index 1f8709d..432dd61 100644 --- a/.hound.yml +++ b/.hound.yml @@ -2,5 +2,5 @@ javascript: enabled: false scss: - config_file: .scss-style.yml + config_file: .scss-lint.yml ignore_file: test/*, knapsack/_reset.scss diff --git a/.pages b/.pages index 46cd30d..99b6b9c 160000 --- a/.pages +++ b/.pages @@ -1 +1 @@ -Subproject commit 46cd30dd65d251520f7550a26ea7b062e2edf335 +Subproject commit 99b6b9c95dba5f383e67006034bc02ba58eb990a diff --git a/.scss-style.yml b/.scss-lint.yml similarity index 98% rename from .scss-style.yml rename to .scss-lint.yml index 5b36464..f4f3c2b 100644 --- a/.scss-style.yml +++ b/.scss-lint.yml @@ -35,7 +35,7 @@ linters: enabled: false style: short HexNotation: - enabled: true + enabled: false style: uppercase HexValidation: enabled: true @@ -69,7 +69,7 @@ linters: PlaceholderInExtend: enabled: false PropertyCount: - enabled: true + enabled: false include_nested: false max_properties: 10 PropertySortOrder: diff --git a/knapsack/_forms.scss b/knapsack/_forms.scss index ea95848..6626230 100644 --- a/knapsack/_forms.scss +++ b/knapsack/_forms.scss @@ -60,7 +60,7 @@ } @else { $border-hover-color: if(luminance($bg-color) < $l-tolerance, $bg-hover-color, rgba(#000, .45)); } - $arrow-color: if(luminance($bg-color) < $l-tolerance, rgba(255,255,255, .9), rgba(#000, .25)); + $arrow-color: if(luminance($bg-color) < $l-tolerance, rgba(255, 255, 255, .9), rgba(#000, .25)); $arrow-hover-color: if(luminance($bg-color) < $l-tolerance, #FFF, rgba(#000, .45)); border: 1px solid $border-color; diff --git a/knapsack/_reset.scss b/knapsack/_reset.scss index 4b3414c..9b32dec 100644 --- a/knapsack/_reset.scss +++ b/knapsack/_reset.scss @@ -90,14 +90,14 @@ mark, audio, video { - margin: 0; - padding: 0; border: 0; - font-size: 100%; font: inherit; + font-size: 100%; + margin: 0; + padding: 0; vertical-align: baseline; } - /* HTML5 display-role reset for older browsers */ + article, aside, details, @@ -147,14 +147,11 @@ /// @example /// @include normalize(); @mixin normalize { - /*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */ + // normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css html { font-family: sans-serif; - /* 1 */ -ms-text-size-adjust: 100%; - /* 2 */ -webkit-text-size-adjust: 100%; - /* 2 */ } body { @@ -205,7 +202,6 @@ abbr[title] { border-bottom: none; - text-decoration: underline; text-decoration: underline dotted; } diff --git a/knapsack/_utilities.scss b/knapsack/_utilities.scss index 788ea17..2591f57 100644 --- a/knapsack/_utilities.scss +++ b/knapsack/_utilities.scss @@ -13,11 +13,11 @@ @if $n >= 0 { @for $i from 1 through $n { - $result: $result * $x; + $result: $result * $x; } } @else { - @for $i from $n to 0 { - $result: $result / $x; + @for $i from $n to 0 { + $result: $result / $x; } } @return $result; diff --git a/package.json b/package.json index e533d07..cd2fee9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "knapsack", - "version": "0.4.0", + "version": "0.4.1", "description": "A handy bag of sass utilities and mixins", "main": "knapsack/_index.scss", "repository": {