Commit 696698d3 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-stylelint-valid-json' into 'master'

Make stylelint config a valid JSON file

See merge request gitlab-org/gitlab-ce!27721
parents 97b4aa4f 86dcb043
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
"plugins":[ "plugins":[
"./scripts/frontend/stylelint/stylelint-duplicate-selectors.js", "./scripts/frontend/stylelint/stylelint-duplicate-selectors.js",
"./scripts/frontend/stylelint/stylelint-utility-classes.js", "./scripts/frontend/stylelint/stylelint-utility-classes.js",
"stylelint-scss", "stylelint-scss"
], ],
"rules":{ "rules":{
"at-rule-blacklist":[ "at-rule-blacklist":[
...@@ -94,7 +94,7 @@ ...@@ -94,7 +94,7 @@
{ {
"message":"Selector should be written in lowercase with hyphens (selector-class-pattern)", "message":"Selector should be written in lowercase with hyphens (selector-class-pattern)",
"severity": "warning" "severity": "warning"
}, }
], ],
"selector-list-comma-newline-after":"always", "selector-list-comma-newline-after":"always",
"selector-max-compound-selectors":[3, { "severity": "warning" }], "selector-max-compound-selectors":[3, { "severity": "warning" }],
...@@ -104,8 +104,8 @@ ...@@ -104,8 +104,8 @@
"selector-pseudo-element-no-unknown":true, "selector-pseudo-element-no-unknown":true,
"shorthand-property-no-redundant-values":true, "shorthand-property-no-redundant-values":true,
"string-quotes":"single", "string-quotes":"single",
"value-no-vendor-prefix":[true, { ignoreValues: ["sticky"] }], "value-no-vendor-prefix":[true, { "ignoreValues": ["sticky"] }],
"stylelint-gitlab/duplicate-selectors":[true,{ "severity": "warning" }], "stylelint-gitlab/duplicate-selectors":[true,{ "severity": "warning" }],
"stylelint-gitlab/utility-classes":[true,{ "severity": "warning" }], "stylelint-gitlab/utility-classes":[true,{ "severity": "warning" }]
} }
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment