jenkins-bot has submitted this change and it was merged.
Change subject: build: Use csscomb to prettify the CSS
......................................................................
build: Use csscomb to prettify the CSS
Change-Id: I7ed6eabd07790769ee935959bae39953b4b5944e
---
A .csscomb.json
M Gruntfile.js
M package.json
3 files changed, 49 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.csscomb.json b/.csscomb.json
new file mode 100644
index 0000000..c4e215e
--- /dev/null
+++ b/.csscomb.json
@@ -0,0 +1,24 @@
+{
+ "remove-empty-rulesets": true,
+ "always-semicolon": true,
+ "color-case": "lower",
+ "block-indent": "\t",
+ "color-shorthand": false,
+ "element-case": "lower",
+ "eof-newline": true,
+ "leading-zero": true,
+ "quotes": "double",
+ "space-before-colon": "",
+ "space-after-colon": " ",
+ "space-before-combinator": " ",
+ "space-after-combinator": " ",
+ "space-between-declarations": "\n",
+ "space-before-opening-brace": " ",
+ "space-after-opening-brace": "\n",
+ "space-after-selector-delimiter": "\n",
+ "space-before-selector-delimiter": "",
+ "space-before-closing-brace": "\n",
+ "strip-spaces": true,
+ "unitless-zero": true,
+ "vendor-prefix-align": true
+}
diff --git a/Gruntfile.js b/Gruntfile.js
index b9a3c40..6724730 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -12,6 +12,7 @@
grunt.loadNpmTasks( 'grunt-contrib-less' );
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
+ grunt.loadNpmTasks( 'grunt-csscomb' );
grunt.loadNpmTasks( 'grunt-file-exists' );
grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-jscs' );
@@ -83,6 +84,28 @@
js: {
dest: 'dist/oojs-ui.js',
src: modules['oojs-ui'].scripts
+ }
+ },
+ csscomb: {
+ core: {
+ files: {
+ 'dist/oojs-ui.css': [
'dist/oojs-ui.css' ],
+ 'dist/oojs-ui.rtl.css': [
'dist/oojs-ui.rtl.css' ],
+ 'dist/oojs-ui.svg.css': [
'dist/oojs-ui.svg.css' ],
+ 'dist/oojs-ui.svg.rtl.css': [
'dist/oojs-ui.svg.rtl.css' ]
+ }
+ },
+ apex: {
+ files: {
+ 'dist/oojs-ui-apex.css': [
'dist/oojs-ui-apex.css' ],
+ 'dist/oojs-ui-apex.rtl.css': [
'dist/oojs-ui-apex.rtl.css' ]
+ }
+ },
+ minerva: {
+ files: {
+ 'dist/oojs-ui-minerva.css': [
'dist/oojs-ui-minerva.css' ],
+ 'dist/oojs-ui-minerva.rtl.css': [
'dist/oojs-ui-minerva.rtl.css' ]
+ }
}
},
copy: {
@@ -174,7 +197,7 @@
} );
} );
- grunt.registerTask( 'build', [ 'clean', 'fileExists', 'less', 'concat',
'cssjanus', 'copy', 'svg2png' ] );
+ grunt.registerTask( 'build', [ 'clean', 'fileExists', 'less', 'concat',
'cssjanus', 'csscomb', 'copy', 'svg2png' ] );
grunt.registerTask( 'git-build', [ 'pre-git-build', 'build' ] );
grunt.registerTask( 'test', [ 'pre-test', 'git-build', 'jshint',
'jscs', 'csslint', 'banana', 'qunit' ] );
grunt.registerTask( 'default', 'test' );
diff --git a/package.json b/package.json
index f51d901..81b879c 100644
--- a/package.json
+++ b/package.json
@@ -32,6 +32,7 @@
"grunt-contrib-less": "0.11.4",
"grunt-contrib-qunit": "0.5.2",
"grunt-contrib-watch": "0.6.1",
+ "grunt-csscomb": "3.0.0",
"grunt-cssjanus": "0.2.2",
"grunt-file-exists": "0.1.1",
"grunt-jscs": "0.7.1",
--
To view, visit https://gerrit.wikimedia.org/r/159076
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ed6eabd07790769ee935959bae39953b4b5944e
Gerrit-PatchSet: 8
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
