jenkins-bot has submitted this change and it was merged.
Change subject: build: Use stylelint instead of csslint
......................................................................
build: Use stylelint instead of csslint
With just a few rules on colour right now.
Change-Id: I4086fae1ea9b48f95dca84504a8edca72b7b41e5
---
D .csslintrc
A .stylelintrc
M Gruntfile.js
M demos/styles/demo.css
M package.json
M src/themes/apex/elements.less
M src/themes/apex/tools.less
M src/themes/apex/widgets.less
8 files changed, 26 insertions(+), 28 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.csslintrc b/.csslintrc
deleted file mode 100644
index e777c7f..0000000
--- a/.csslintrc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
- "adjoining-classes": false,
- "box-model": false,
- "box-sizing": false,
- "fallback-colors": false,
- "important": false,
- "outline-none": false,
- "qualified-headings": false,
- "universal-selector": false,
- "unqualified-attributes": false
-}
diff --git a/.stylelintrc b/.stylelintrc
new file mode 100644
index 0000000..b10435c
--- /dev/null
+++ b/.stylelintrc
@@ -0,0 +1,8 @@
+{
+ "rules": {
+ "color-hex-case": [ "lower" ],
+ "color-hex-length": [ "short" ],
+ "color-named": [ "never" ],
+ "color-no-invalid-hex": true
+ }
+}
\ No newline at end of file
diff --git a/Gruntfile.js b/Gruntfile.js
index e9cc1b4..377bdce 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -26,7 +26,6 @@
grunt.loadNpmTasks( 'grunt-contrib-clean' );
grunt.loadNpmTasks( 'grunt-contrib-concat' );
grunt.loadNpmTasks( 'grunt-contrib-copy' );
- grunt.loadNpmTasks( 'grunt-contrib-csslint' );
grunt.loadNpmTasks( 'grunt-contrib-cssmin' );
grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-contrib-less' );
@@ -40,6 +39,7 @@
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
grunt.loadNpmTasks( 'grunt-karma' );
+ grunt.loadNpmTasks( 'grunt-stylelint' );
grunt.loadNpmTasks( 'grunt-svg2png' );
grunt.loadNpmTasks( 'grunt-tyops' );
grunt.loadTasks( 'build/tasks' );
@@ -360,12 +360,13 @@
},
// Lint – Styling
- csslint: {
+ stylelint: {
options: {
- csslintrc: '.csslintrc'
+ syntax: 'less'
},
- all: [
+ src: [
'{demos,src}/**/*.css',
+ '{demos,src}/**/*.less',
'!demos/dist/**'
]
},
@@ -434,10 +435,10 @@
watch: {
files: [
'<%= jshint.dev %>',
- '<%= csslint.all %>',
+ '<%= stylelint.all %>',
'src/**/*.less',
'php/**/*.php',
- '.{csslintrc,jscsrc,jshintignore,jshintrc}'
+ '.{stylelintrc,jscsrc,jshintignore,jshintrc}'
],
tasks: 'quick-build'
}
@@ -516,7 +517,7 @@
grunt.registerTask( 'minify', [ 'uglify', 'image', 'cssmin' ] );
grunt.registerTask( 'publish-build', [ 'build', 'minify' ] );
- grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'jsonlint',
'banana' ] );
+ grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'stylelint',
'jsonlint', 'banana' ] );
grunt.registerTask( 'test', [ 'lint', 'git-build', 'build-tests',
'karma:main', 'karma:other' ] );
grunt.registerTask( 'demos', [ 'clean:demos', 'copy:demos',
'exec:demos' ] );
diff --git a/demos/styles/demo.css b/demos/styles/demo.css
index 5b3fed0..be9dc89 100644
--- a/demos/styles/demo.css
+++ b/demos/styles/demo.css
@@ -184,7 +184,7 @@
}
.oo-ui-demo-console-log-line-error {
- color: red;
+ color: #f00;
}
.oo-ui-demo-console-label {
@@ -209,7 +209,7 @@
width: 20px;
text-align: center;
content: '→';
- color: blue;
+ color: #00f;
}
.oo-ui-demo-console-input {
diff --git a/package.json b/package.json
index ba3f220..96d985e 100644
--- a/package.json
+++ b/package.json
@@ -31,7 +31,6 @@
"grunt-contrib-clean": "1.0.0",
"grunt-contrib-concat": "1.0.0",
"grunt-contrib-copy": "1.0.0",
- "grunt-contrib-csslint": "1.0.0",
"grunt-contrib-cssmin": "1.0.1",
"grunt-contrib-jshint": "1.0.0",
"grunt-contrib-less": "1.2.0",
@@ -46,6 +45,7 @@
"grunt-jsonlint": "1.0.7",
"grunt-karma": "0.12.2",
"grunt-promise-q": "0.1.1",
+ "grunt-stylelint": "0.2.0",
"grunt-svg2png":
"git://github.com/jdforrester/grunt-svg2png.git#v0.2.7-wmf.1",
"grunt-tyops": "0.1.0",
"grunt": "0.4.5",
diff --git a/src/themes/apex/elements.less b/src/themes/apex/elements.less
index 70686f4..ba90281 100644
--- a/src/themes/apex/elements.less
+++ b/src/themes/apex/elements.less
@@ -112,7 +112,7 @@
&.oo-ui-buttonElement-active > .oo-ui-buttonElement-button,
&.oo-ui-buttonElement-pressed > .oo-ui-buttonElement-button {
box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.07);
- color: black;
+ color: #000;
border-color: #c9c9c9;
.oo-ui-vertical-gradient(#ddd, #fff);
}
diff --git a/src/themes/apex/tools.less b/src/themes/apex/tools.less
index 1b5bdca..c989258 100644
--- a/src/themes/apex/tools.less
+++ b/src/themes/apex/tools.less
@@ -297,7 +297,7 @@
top: 2.5em;
margin: 0 -1px;
border: 1px solid #ccc;
- background-color: white;
+ background-color: #fff;
box-shadow: 0 0.3125em 1.25em rgba(0,0,0,0.25);
}
diff --git a/src/themes/apex/widgets.less b/src/themes/apex/widgets.less
index 3fce6c6..4121eef 100644
--- a/src/themes/apex/widgets.less
+++ b/src/themes/apex/widgets.less
@@ -386,9 +386,9 @@
font-size: inherit;
font-family: inherit;
background-color: @background-color-main;
- color: black;
+ color: #000;
border: 1px solid #ccc;
- box-shadow: 0 0 0 white, inset 0 0.1em 0.2em #ddd;
+ box-shadow: 0 0 0 #fff, inset 0 0.1em 0.2em #ddd;
border-radius: 0.25em;
.oo-ui-transition(border-color @medium-ease, box-shadow
@medium-ease);
@@ -402,7 +402,7 @@
textarea:focus {
outline: none;
border-color: #a7dcff;
- box-shadow: 0 0 0.3em #a7dcff, 0 0 0 white;
+ box-shadow: 0 0 0.3em #a7dcff, 0 0 0 #fff;
}
input[readonly],
@@ -527,7 +527,7 @@
font-size: inherit;
font-family: inherit;
background-color: transparent;
- color: black;
+ color: #000;
vertical-align: middle;
}
@@ -967,7 +967,7 @@
height: 2em;
width: @travelDistance + 2em;
border-radius: 1em;
- box-shadow: 0 0 0 white, inset 0 0.1em 0.2em #ddd;
+ box-shadow: 0 0 0 #fff, inset 0 0.1em 0.2em #ddd;
border: 1px solid #ccc;
.oo-ui-inline-spacing(0.5em);
--
To view, visit https://gerrit.wikimedia.org/r/289119
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4086fae1ea9b48f95dca84504a8edca72b7b41e5
Gerrit-PatchSet: 6
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE <volke...@wikimedia.org>
Gerrit-Reviewer: Bartosz Dziewoński <matma....@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
