Skip to content

Commit

Permalink
Merge pull request thelounge#1249 from thelounge/xpaw/stylelint-confi…
Browse files Browse the repository at this point in the history
…g-standard

Use stylelint-config-standard
  • Loading branch information
astorije authored Jun 23, 2017
2 parents b88c665 + 167c7c8 commit 37eed11
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 86 deletions.
4 changes: 0 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,3 @@ trim_trailing_whitespace = false
[*.{json,yml}]
indent_style = space
indent_size = 2

[.eslintrc]
indent_style = space
indent_size = 2
77 changes: 0 additions & 77 deletions .stylelintrc

This file was deleted.

10 changes: 10 additions & 0 deletions .stylelintrc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
extends: stylelint-config-standard

ignoreFiles:
- coverage/**/*.css
- client/css/bootstrap.css

rules:
indentation: tab
number-leading-zero: never
selector-pseudo-element-colon-notation: single
6 changes: 1 addition & 5 deletions client/css/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ body {
color: #222;
font: 16px Lato, sans-serif;
margin: 0;

-webkit-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
Expand Down Expand Up @@ -1722,10 +1721,7 @@ kbd {
border-right-color: #222;
}

@media only screen and (-webkit-min-device-pixel-ratio: 2),
only screen and (min--moz-device-pixel-ratio: 2),
only screen and (-moz-min-device-pixel-ratio: 2),
only screen and (min-device-pixel-ratio: 2),
@media
only screen and (min-resolution: 192dpi),
only screen and (min-resolution: 2dppx) {
.tooltipped-w:after {
Expand Down
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@
"nyc": "11.0.2",
"socket.io-client": "1.7.3",
"stylelint": "7.11.1",
"stylelint-config-standard": "16.0.0",
"urijs": "1.18.10",
"webpack": "3.0.0"
}
Expand Down

0 comments on commit 37eed11

Please sign in to comment.