WMDE-Fisch has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/338744 )
Change subject: build: Bump stylelint and make pass
......................................................................
build: Bump stylelint and make pass
grunt-stylelint 0.6.0 → 0.7.0
stylelint-config-wikimedia 0.3.0 → 0.4.1
Change-Id: Icf15dadfc2d0dc0b7f82280d1c5724b0846d586c
---
M modules/ext.TwoColConflict.css
M package.json
2 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict
refs/changes/44/338744/1
diff --git a/modules/ext.TwoColConflict.css b/modules/ext.TwoColConflict.css
index 7c95109..62dfcb6 100644
--- a/modules/ext.TwoColConflict.css
+++ b/modules/ext.TwoColConflict.css
@@ -18,13 +18,11 @@
margin-bottom: 10px;
}
-.mw-twocolconflict-editor-col.mw-twocolconflict-js
-.mw-twocolconflict-col-desc {
+.mw-twocolconflict-editor-col.mw-twocolconflict-js .mw-twocolconflict-col-desc
{
margin-bottom: 74px; /* diff-options height - editor-toolbar height */
}
-.mw-twocolconflict-editor-col.mw-twocolconflict-js.mw-twocolconflict-wikieditor
-.mw-twocolconflict-col-desc {
+.mw-twocolconflict-editor-col.mw-twocolconflict-js.mw-twocolconflict-wikieditor
.mw-twocolconflict-col-desc {
margin-bottom: 62px; /* diff-options height - editor-toolbar height */
}
diff --git a/package.json b/package.json
index 369d09c..a2a0960 100644
--- a/package.json
+++ b/package.json
@@ -9,7 +9,7 @@
"grunt-banana-checker": "0.5.0",
"grunt-eslint": "19.0.0",
"grunt-jsonlint": "1.1.0",
- "grunt-stylelint": "0.6.0",
- "stylelint-config-wikimedia": "0.3.0"
+ "grunt-stylelint": "0.7.0",
+ "stylelint-config-wikimedia": "0.4.1"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/338744
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icf15dadfc2d0dc0b7f82280d1c5724b0846d586c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: WMDE-Fisch <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
