From 138111b16e7da0bb0892f678615bd1d5cb46991d Mon Sep 17 00:00:00 2001 From: Pavel Djundik Date: Wed, 21 Jun 2017 14:58:14 +0300 Subject: [PATCH] Use stylelint-config-standard --- .editorconfig | 4 --- .stylelintrc | 77 -------------------------------------------- .stylelintrc.yml | 10 ++++++ client/css/style.css | 6 +--- package.json | 1 + 5 files changed, 12 insertions(+), 86 deletions(-) delete mode 100644 .stylelintrc create mode 100644 .stylelintrc.yml diff --git a/.editorconfig b/.editorconfig index 7907cdff..ac4d682b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -18,7 +18,3 @@ trim_trailing_whitespace = false [*.{json,yml}] indent_style = space indent_size = 2 - -[.eslintrc] -indent_style = space -indent_size = 2 diff --git a/.stylelintrc b/.stylelintrc deleted file mode 100644 index cabb1fda..00000000 --- a/.stylelintrc +++ /dev/null @@ -1,77 +0,0 @@ -{ - "ignoreFiles": [ - "client/css/bootstrap.css", - "coverage/**/*.css" - ], - "rules": { - "at-rule-empty-line-before": ["always", { - "except": ["blockless-after-blockless", "first-nested"], - "ignore": ["after-comment"] - }], - "block-closing-brace-newline-after": "always", - "block-closing-brace-newline-before": "always-multi-line", - "block-closing-brace-space-before": "always-single-line", - "block-no-empty": true, - "block-opening-brace-newline-after": "always-multi-line", - "block-opening-brace-space-after": "always-single-line", - "block-opening-brace-space-before": "always", - "color-hex-case": "lower", - "color-hex-length": "short", - "color-no-invalid-hex": true, - "comment-empty-line-before": ["always", { - "except": ["first-nested"], - "ignore": ["stylelint-command"] - }], - "comment-whitespace-inside": "always", - "declaration-bang-space-after": "never", - "declaration-bang-space-before": "always", - "declaration-block-semicolon-newline-after": "always-multi-line", - "declaration-block-semicolon-space-after": "always-single-line", - "declaration-block-semicolon-space-before": "never", - "declaration-block-single-line-max-declarations": 1, - "declaration-colon-newline-after": "always-multi-line", - "declaration-colon-space-after": "always-single-line", - "declaration-colon-space-before": "never", - "function-calc-no-unspaced-operator": true, - "function-comma-newline-after": "always-multi-line", - "function-comma-space-after": "always-single-line", - "function-comma-space-before": "never", - "function-parentheses-newline-inside": "always-multi-line", - "function-parentheses-space-inside": "never-single-line", - "function-whitespace-after": "always", - "function-url-quotes": "always", - "indentation": "tab", - "max-empty-lines": 1, - "media-feature-colon-space-after": "always", - "media-feature-colon-space-before": "never", - "media-feature-range-operator-space-after": "always", - "media-feature-range-operator-space-before": "always", - "media-query-list-comma-newline-after": "always-multi-line", - "media-query-list-comma-space-after": "always-single-line", - "media-query-list-comma-space-before": "never", - "media-feature-parentheses-space-inside": "never", - "no-eol-whitespace": true, - "no-missing-end-of-source-newline": true, - "number-leading-zero": "never", - "number-no-trailing-zeros": true, - "length-zero-no-unit": true, - "declaration-block-no-duplicate-properties": [true, { - "ignore": ["consecutive-duplicates"] - }], - "declaration-block-no-shorthand-property-overrides": true, - "rule-empty-line-before": ["always-multi-line", { - "except": ["first-nested"], - "ignore": ["after-comment"], - }], - "declaration-block-trailing-semicolon": "always", - "selector-combinator-space-after": "always", - "selector-combinator-space-before": "always", - "selector-list-comma-newline-after": "always", - "selector-list-comma-space-before": "never", - "selector-pseudo-element-colon-notation": "single", - "string-quotes": "double", - "value-list-comma-newline-after": "always-multi-line", - "value-list-comma-space-after": "always-single-line", - "value-list-comma-space-before": "never" - } -} diff --git a/.stylelintrc.yml b/.stylelintrc.yml new file mode 100644 index 00000000..bf00b147 --- /dev/null +++ b/.stylelintrc.yml @@ -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 diff --git a/client/css/style.css b/client/css/style.css index 85ba34cc..01891104 100644 --- a/client/css/style.css +++ b/client/css/style.css @@ -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; @@ -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 { diff --git a/package.json b/package.json index 6a6c82e9..60616854 100644 --- a/package.json +++ b/package.json @@ -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": "2.6.1" }