Skip to content

Commit

Permalink
Merge pull request #25 from kni-labs/linting-update
Browse files Browse the repository at this point in the history
linting tweaks
  • Loading branch information
dbox committed Feb 29, 2016
2 parents c5fed94 + 3d404d5 commit 8f95a09
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .hound.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ javascript:
enabled: false

scss:
config_file: .scss-style.yml
config_file: .scss-lint.yml
ignore_file: test/*, knapsack/_reset.scss
2 changes: 1 addition & 1 deletion .pages
Submodule .pages updated from 46cd30 to 99b6b9
4 changes: 2 additions & 2 deletions .scss-style.yml → .scss-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ linters:
enabled: false
style: short
HexNotation:
enabled: true
enabled: false
style: uppercase
HexValidation:
enabled: true
Expand Down Expand Up @@ -69,7 +69,7 @@ linters:
PlaceholderInExtend:
enabled: false
PropertyCount:
enabled: true
enabled: false
include_nested: false
max_properties: 10
PropertySortOrder:
Expand Down
2 changes: 1 addition & 1 deletion knapsack/_forms.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 5 additions & 9 deletions knapsack/_reset.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -205,7 +202,6 @@

abbr[title] {
border-bottom: none;
text-decoration: underline;
text-decoration: underline dotted;
}

Expand Down
6 changes: 3 additions & 3 deletions knapsack/_utilities.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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": {
Expand Down

0 comments on commit 8f95a09

Please sign in to comment.