Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/289386
Change subject: Introduce stylelint
......................................................................
Introduce stylelint
Change-Id: I35844d211f291a4c07010c89875fac022d36ec64
---
A .stylelintrc
M Gruntfile.js
A modules/ve-maps/.stylelintrc
M package.json
M styles/kartographer.less
5 files changed, 48 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/86/289386/1
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..2c90730
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,3 @@
+{
+ "extends": "stylelint-config-wikimedia"
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index f419e3f..e6271c3 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -5,6 +5,7 @@
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.initConfig( {
jshint: {
@@ -37,10 +38,32 @@
},
watch: {
files: [
- '.{jscsrc,jshintignore,jshintrc}',
+ '.{stylelintrc,jscsrc,jshintignore,jshintrc}',
'<%= jshint.all %>'
],
tasks: 'test'
+ },
+ stylelint: {
+ core: {
+ options: {
+ syntax: 'less'
+ },
+ src: [
+ '**/*.css',
+ '**/*.less',
+ '!modules/ve-maps/**',
+ '!node_modules/**',
+ '!lib/**'
+ ]
+ },
+ 've-maps': {
+ options: {
+ configFile:
'modules/ve-maps/.stylelintrc'
+ },
+ src: [
+ 'modules/ve-maps/**/*.css'
+ ]
+ }
},
jsonlint: {
all: [
@@ -50,7 +73,7 @@
}
} );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs:main', 'jsonlint',
'banana' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'jscs:main', 'stylelint',
'jsonlint', 'banana' ] );
grunt.registerTask( 'fix', 'jscs:fix' );
grunt.registerTask( 'test', 'lint' );
grunt.registerTask( 'default', 'test' );
diff --git a/modules/ve-maps/.stylelintrc b/modules/ve-maps/.stylelintrc
new file mode 100644
index 0000000..87325ff
--- /dev/null
+++ b/modules/ve-maps/.stylelintrc
@@ -0,0 +1,12 @@
+{
+ "extends": "stylelint-config-wikimedia",
+ "rules": {
+ "no-browser-hacks": [ true, {
+ "browsers": [ ">5%", "Chrome >= 1", "Firefox >= 15",
"Explorer >= 9", "Edge >= 1", "iOS >= 7", "Opera >= 12", "Safari >= 7",
"ExplorerMobile >= 10", "Android >= 3", "not BlackBerry >= 1", "ChromeAndroid
>= 1", "FirefoxAndroid >= 1", "OperaMobile >= 12", "not OperaMini >= 1" ]
+ } ],
+
+ "no-unsupported-browser-features": [ true, {
+ "browsers": [ ">5%", "Chrome >= 1", "Firefox >= 15",
"Explorer >= 9", "Edge >= 12", "iOS >= 7", "Opera >= 12", "Safari >= 7",
"ExplorerMobile >= 10", "Android >= 4", "not BlackBerry >= 1", "ChromeAndroid
>= 1", "FirefoxAndroid >= 1", "OperaMobile >= 12", "not OperaMini >= 1" ]
+ } ],
+ }
+}
diff --git a/package.json b/package.json
index 40b73dc..93c16c9 100644
--- a/package.json
+++ b/package.json
@@ -8,15 +8,17 @@
"build-lib": "node_modules/.bin/browserify lib/mapbox/mapbox-main.js -o
lib/mapbox/mapbox-lib.js && cp -rv node_modules/mapbox.js/theme/* lib/mapbox/
&& rm lib/mapbox/images/render.sh && cp -v
node_modules/leaflet-sleep/Leaflet.Sleep.js lib/leaflet.sleep.js"
},
"devDependencies": {
- "mapbox.js": "^2.3.0",
"browserify": "^13.0.0",
- "grunt": "0.4.5",
- "grunt-cli": "0.1.13",
+ "grunt": "1.0.1",
"grunt-banana-checker": "0.5.0",
+ "grunt-cli": "1.2.0",
"grunt-contrib-jshint": "1.0.0",
"grunt-contrib-watch": "1.0.0",
"grunt-jscs": "2.8.0",
- "grunt-jsonlint": "1.0.7"
+ "grunt-jsonlint": "1.0.7",
+ "grunt-stylelint": "0.2.0",
+ "mapbox.js": "^2.3.0",
+ "stylelint-config-wikimedia": "0.1.0"
},
"dependencies": {
"leaflet": "^0.7.7",
diff --git a/styles/kartographer.less b/styles/kartographer.less
index 7586d5a..1d50ae7 100644
--- a/styles/kartographer.less
+++ b/styles/kartographer.less
@@ -44,7 +44,7 @@
}
.mw-kartographer-error {
- background: #ffc0cb
+ background: #ffc0cb;
}
a.mw-kartographer-link {
@@ -52,7 +52,7 @@
}
.mw-kartographer-autostyled {
- color: white;
+ color: #fff;
}
.leaflet-bar a {
--
To view, visit https://gerrit.wikimedia.org/r/289386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I35844d211f291a4c07010c89875fac022d36ec64
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
