jenkins-bot has submitted this change and it was merged.
Change subject: Stylelint: Switch to Wikimedia preset with exceptions
......................................................................
Stylelint: Switch to Wikimedia preset with exceptions
Change-Id: I9fdd5b96858e381636a101537559d2a26e5edad1
---
M .stylelintrc
M minerva.less/minerva.variables.less
M package.json
M resources/mobile.mainMenu/mainmenu.less
4 files changed, 11 insertions(+), 90 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.stylelintrc b/.stylelintrc
index 33f1f00..42859a4 100644
--- a/.stylelintrc
+++ b/.stylelintrc
@@ -1,91 +1,11 @@
{
+ "extends": "stylelint-config-wikimedia",
"rules": {
- "indentation": [ "tab" ],
- "max-empty-lines": 1,
- "no-eol-whitespace": true,
- "no-missing-eof-newline": true,
-
- "no-duplicate-selectors": true,
-
- "color-hex-case": [ "lower" ],
- "color-hex-length": [ "short" ],
- "color-named": [ "never" ],
- "color-no-invalid-hex": true,
-
- "font-family-name-quotes": [ "single-unless-keyword" ],
- "font-weight-notation": [ "named-where-possible" ],
-
- "function-calc-no-unspaced-operator": true,
- "function-comma-newline-after": "never-multi-line",
- "function-comma-newline-before": "never-multi-line",
- "function-comma-space-after": [ "always" ],
- "function-comma-space-before": [ "never" ],
- "function-parentheses-newline-inside": [ "never-multi-line" ],
- "function-parentheses-space-inside": [ "always" ],
- "function-url-quotes": [ "none" ],
- "function-whitespace-after": [ "always" ],
-
- "value-list-comma-newline-after": [ "never-multi-line" ],
- "value-list-comma-newline-before": [ "never-multi-line" ],
- "value-list-comma-space-after": [ "always-single-line" ],
- "value-list-comma-space-before": [ "never" ],
-
- "declaration-bang-space-after": [ "never" ],
- "declaration-bang-space-before": [ "always" ],
- "declaration-colon-space-after": [ "always" ],
- "declaration-colon-space-before": [ "never" ],
-
- "string-no-newline": true,
- "string-quotes": [ "single" ],
-
- "declaration-block-no-duplicate-properties": [ true, { ignore:
[ "consecutive-duplicates" ] } ],
- "declaration-block-no-shorthand-property-overrides": true,
-
- "declaration-block-semicolon-newline-after": [ "always" ],
- "declaration-block-semicolon-newline-before": [
"never-multi-line" ],
- "declaration-block-semicolon-space-after": [
"always-single-line" ],
- "declaration-block-semicolon-space-before": [ "never" ],
- "declaration-block-single-line-max-declarations": 1,
- "declaration-block-trailing-semicolon": [ "always" ],
-
- "block-closing-brace-newline-after": [ "always" ],
- "block-closing-brace-newline-before": [ "always-multi-line" ],
- "block-closing-brace-space-after": [ "always-single-line" ],
- "block-closing-brace-space-before": [ "always-single-line" ],
- "block-no-empty": true,
- "block-no-single-line": true,
- "block-opening-brace-newline-after": [ "always-multi-line" ],
- "block-opening-brace-space-after": [ "always-single-line" ],
- "block-opening-brace-space-before": [ "always" ],
-
- "selector-combinator-space-after": [ "always" ],
- "selector-combinator-space-before": [ "always" ],
- "selector-no-vendor-prefix": true,
- "selector-root-no-composition": true,
-
- "selector-list-comma-newline-before": [ "never-multi-line" ],
- "selector-list-comma-space-after": [ "always-single-line" ],
- "selector-list-comma-space-before": [ "never" ],
-
- "media-feature-colon-space-after": [ "always" ],
- "media-feature-colon-space-before": [ "never" ],
- "media-feature-name-no-vendor-prefix": true,
- "media-feature-no-missing-punctuation": true,
- "media-feature-range-operator-space-after": [ "always" ],
- "media-feature-range-operator-space-before": [ "always" ],
-
- "media-query-parentheses-space-inside": [ "always" ],
-
- "media-query-list-comma-newline-after": [ "always-multi-line" ],
- "media-query-list-comma-newline-before": [ "never-multi-line" ],
- "media-query-list-comma-space-after": [ "always-single-line" ],
- "media-query-list-comma-space-before": [ "never" ],
-
- "at-rule-empty-line-before": [ "always", {
- except: [ "blockless-group", "first-nested" ],
- ignore: ["after-comment"],
- } ],
- "at-rule-name-case": "lower",
- "at-rule-name-space-after": "always-single-line"
+ "value-border-zero": null,
+ "number-leading-zero": null,
+ "declaration-no-important": null,
+ "no-descending-specificity": null,
+ "selector-list-comma-newline-after": null,
+ "selector-no-id": null
}
}
diff --git a/minerva.less/minerva.variables.less
b/minerva.less/minerva.variables.less
index 8638fb5..9494648 100644
--- a/minerva.less/minerva.variables.less
+++ b/minerva.less/minerva.variables.less
@@ -66,7 +66,7 @@
// typography
@fontFamily: 'Helvetica Neue', 'Helvetica', 'Nimbus Sans L', 'Arial',
'Liberation Sans', sans-serif;
@fontFamilyHeading: 'Linux Libertine', 'Georgia',' Times', serif;
-@fontScalingFactor: 1.0;
+@fontScalingFactor: 1;
@contentLineHeight: 1.65;
@headingMargin: .5em;
diff --git a/package.json b/package.json
index 534aa0c..8d3e1e8 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
"grunt-notify": "0.4.5",
"js-beautify": "1.5.10",
"jscs-preset-wikimedia": "1.0.0",
- "grunt-stylelint": "0.3.0"
+ "grunt-stylelint": "0.3.0",
+ "stylelint-config-wikimedia": "0.2.0"
}
}
diff --git a/resources/mobile.mainMenu/mainmenu.less
b/resources/mobile.mainMenu/mainmenu.less
index 8a277f8..10c0551 100644
--- a/resources/mobile.mainMenu/mainmenu.less
+++ b/resources/mobile.mainMenu/mainmenu.less
@@ -29,7 +29,7 @@
.main-menu-button {
&.indicator-circle {
overflow: initial;
- &::after {
+ &:after {
content: '';
background-color: @colorProgressive;
width: .65em;
--
To view, visit https://gerrit.wikimedia.org/r/290230
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9fdd5b96858e381636a101537559d2a26e5edad1
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
