Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/158386
Change subject: Use grunt-grunticon to convert SVG icons to PNG for distribution
......................................................................
Use grunt-grunticon to convert SVG icons to PNG for distribution
Good things about grunticon:
* It will also let us colorize the icons (both SVG and PNG versions),
which we need for feature parity with icon fonts, and which is the
whole point of using it in the first place.
Bad things about grunticon:
* It does a bunch more things in addition to SVG to PNG conversion and
colorizing, that we don't really want and that can't be turned off.
Nothing a quick `rm -rf` can't fix.
* It has very limited globbing support, requiring a separate task
definition for each directory that needs to be processed. You might
think that this would work:
files: [ {
expand: true,
src: [ '**/*.svg' ],
cwd: 'src/styles/images',
dest: 'dist/images'
} ]
…but it results in all generated PNGs landing directly in
dist/images rather than appropriate subdirectories.
* To make the previous worse, the 'files' entry in task configuration
contains an array, but everything other than the first element of it
is ignored.
Change-Id: Ida886f1348f3e8d9537b6f1dc2f1ea14bf5c2c06
---
M Gruntfile.js
M package.json
D src/styles/images/icons/accept.png
D src/styles/images/icons/add-item.png
D src/styles/images/icons/advanced.png
D src/styles/images/icons/alert.png
D src/styles/images/icons/arched-arrow-ltr.png
D src/styles/images/icons/arched-arrow-rtl.png
D src/styles/images/icons/check.png
D src/styles/images/icons/clear.png
D src/styles/images/icons/close.png
D src/styles/images/icons/code.png
D src/styles/images/icons/collapse.png
D src/styles/images/icons/comment.png
D src/styles/images/icons/expand.png
D src/styles/images/icons/help.png
D src/styles/images/icons/history.png
D src/styles/images/icons/info.png
D src/styles/images/icons/link.png
D src/styles/images/icons/menu.png
D src/styles/images/icons/move-ltr.png
D src/styles/images/icons/move-rtl.png
D src/styles/images/icons/picture.png
D src/styles/images/icons/remove-item.png
D src/styles/images/icons/remove.png
D src/styles/images/icons/search.png
D src/styles/images/icons/settings.png
D src/styles/images/icons/tag.png
D src/styles/images/icons/window.png
D src/styles/images/indicators/alert.png
D src/styles/images/indicators/arrow-down.png
D src/styles/images/indicators/arrow-ltr.png
D src/styles/images/indicators/arrow-rtl.png
D src/styles/images/indicators/arrow-up.png
D src/styles/images/indicators/required.png
D src/styles/images/textures/transparency.png
36 files changed, 42 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/86/158386/1
diff --git a/Gruntfile.js b/Gruntfile.js
index b39fae7..2a580e5 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -13,6 +13,7 @@
grunt.loadNpmTasks( 'grunt-contrib-qunit' );
grunt.loadNpmTasks( 'grunt-contrib-watch' );
grunt.loadNpmTasks( 'grunt-file-exists' );
+ grunt.loadNpmTasks( 'grunt-grunticon' );
grunt.loadNpmTasks( 'grunt-cssjanus' );
grunt.loadNpmTasks( 'grunt-jscs' );
grunt.loadTasks( 'build/tasks' );
@@ -50,7 +51,8 @@
grunt.initConfig( {
pkg: grunt.file.readJSON( 'package.json' ),
clean: {
- dist: 'dist/*'
+ dist: 'dist/*',
+ 'grunticon-junk': 'dist/**/grunticon-junk'
},
fileExists: {
code: modules['oojs-ui'].scripts,
@@ -82,6 +84,40 @@
js: {
dest: 'dist/oojs-ui.js',
src: modules['oojs-ui'].scripts
+ }
+ },
+ grunticon: {
+ options: {
+ datasvgcss: 'grunticon-junk/datasvgcss.dat',
+ datapngcss: 'grunticon-junk/datapngcss.dat',
+ urlpngcss: 'grunticon-junk/urlpngcss.dat',
+ previewhtml: 'grunticon-junk/previewhtml.dat',
+ loadersnippet:
'grunticon-junk/loadersnippet.dat',
+ pngfolder: ''
+ },
+ imagesIcons: {
+ files: [ {
+ expand: true,
+ src: [ '*.svg' ],
+ cwd: 'src/styles/images/icons',
+ dest: 'dist/images/icons'
+ } ]
+ },
+ imagesIndicators: {
+ files: [ {
+ expand: true,
+ src: [ '*.svg' ],
+ cwd: 'src/styles/images/indicators',
+ dest: 'dist/images/indicators'
+ } ]
+ },
+ imagesTextures: {
+ files: [ {
+ expand: true,
+ src: [ '*.svg' ],
+ cwd: 'src/styles/images/textures',
+ dest: 'dist/images/textures'
+ } ]
}
},
copy: {
@@ -162,7 +198,9 @@
} );
} );
- grunt.registerTask( 'build', [ 'clean', 'fileExists', 'less', 'concat',
'cssjanus', 'copy' ] );
+ grunt.registerTask( 'grunticon-convertonly', [ 'grunticon',
'clean:grunticon-junk' ] );
+
+ grunt.registerTask( 'build', [ 'clean:dist', 'fileExists', 'less',
'concat', 'cssjanus', 'grunticon-convertonly', 'copy' ] );
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 f87dbe4..2f88333 100644
--- a/package.json
+++ b/package.json
@@ -34,6 +34,7 @@
"grunt-contrib-watch": "0.6.1",
"grunt-file-exists": "0.1.1",
"grunt-cssjanus": "0.2.2",
- "grunt-jscs": "0.6.1"
+ "grunt-jscs": "0.6.1",
+ "grunt-grunticon": "1.2.13"
}
}
diff --git a/src/styles/images/icons/accept.png
b/src/styles/images/icons/accept.png
deleted file mode 100644
index 1075110..0000000
--- a/src/styles/images/icons/accept.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/add-item.png
b/src/styles/images/icons/add-item.png
deleted file mode 100644
index 5cf353f..0000000
--- a/src/styles/images/icons/add-item.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/advanced.png
b/src/styles/images/icons/advanced.png
deleted file mode 100644
index 7f5ada5..0000000
--- a/src/styles/images/icons/advanced.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/alert.png
b/src/styles/images/icons/alert.png
deleted file mode 100644
index 992ea2a..0000000
--- a/src/styles/images/icons/alert.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/arched-arrow-ltr.png
b/src/styles/images/icons/arched-arrow-ltr.png
deleted file mode 100644
index 5db1c4d..0000000
--- a/src/styles/images/icons/arched-arrow-ltr.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/arched-arrow-rtl.png
b/src/styles/images/icons/arched-arrow-rtl.png
deleted file mode 100644
index 7931971..0000000
--- a/src/styles/images/icons/arched-arrow-rtl.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/check.png
b/src/styles/images/icons/check.png
deleted file mode 100644
index 82c3cb4..0000000
--- a/src/styles/images/icons/check.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/clear.png
b/src/styles/images/icons/clear.png
deleted file mode 100644
index 697dd62..0000000
--- a/src/styles/images/icons/clear.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/close.png
b/src/styles/images/icons/close.png
deleted file mode 100644
index f7eed9f..0000000
--- a/src/styles/images/icons/close.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/code.png b/src/styles/images/icons/code.png
deleted file mode 100644
index a5ebdbf..0000000
--- a/src/styles/images/icons/code.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/collapse.png
b/src/styles/images/icons/collapse.png
deleted file mode 100644
index 38b796f..0000000
--- a/src/styles/images/icons/collapse.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/comment.png
b/src/styles/images/icons/comment.png
deleted file mode 100644
index 9546455..0000000
--- a/src/styles/images/icons/comment.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/expand.png
b/src/styles/images/icons/expand.png
deleted file mode 100644
index e90aca1..0000000
--- a/src/styles/images/icons/expand.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/help.png b/src/styles/images/icons/help.png
deleted file mode 100644
index dca745b..0000000
--- a/src/styles/images/icons/help.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/history.png
b/src/styles/images/icons/history.png
deleted file mode 100644
index c049931..0000000
--- a/src/styles/images/icons/history.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/info.png b/src/styles/images/icons/info.png
deleted file mode 100644
index f43804d..0000000
--- a/src/styles/images/icons/info.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/link.png b/src/styles/images/icons/link.png
deleted file mode 100644
index 7dfa268..0000000
--- a/src/styles/images/icons/link.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/menu.png b/src/styles/images/icons/menu.png
deleted file mode 100644
index b5ac60f..0000000
--- a/src/styles/images/icons/menu.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/move-ltr.png
b/src/styles/images/icons/move-ltr.png
deleted file mode 100644
index ded5f05..0000000
--- a/src/styles/images/icons/move-ltr.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/move-rtl.png
b/src/styles/images/icons/move-rtl.png
deleted file mode 100644
index fc6e62d..0000000
--- a/src/styles/images/icons/move-rtl.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/picture.png
b/src/styles/images/icons/picture.png
deleted file mode 100644
index faf8af9..0000000
--- a/src/styles/images/icons/picture.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/remove-item.png
b/src/styles/images/icons/remove-item.png
deleted file mode 100644
index 2f11db3..0000000
--- a/src/styles/images/icons/remove-item.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/remove.png
b/src/styles/images/icons/remove.png
deleted file mode 100644
index d7e116c..0000000
--- a/src/styles/images/icons/remove.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/search.png
b/src/styles/images/icons/search.png
deleted file mode 100644
index df29792..0000000
--- a/src/styles/images/icons/search.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/settings.png
b/src/styles/images/icons/settings.png
deleted file mode 100644
index b1b35e9..0000000
--- a/src/styles/images/icons/settings.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/tag.png b/src/styles/images/icons/tag.png
deleted file mode 100644
index 722f4d7..0000000
--- a/src/styles/images/icons/tag.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/icons/window.png
b/src/styles/images/icons/window.png
deleted file mode 100644
index 3d48a3c..0000000
--- a/src/styles/images/icons/window.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/indicators/alert.png
b/src/styles/images/indicators/alert.png
deleted file mode 100644
index bfc83e7..0000000
--- a/src/styles/images/indicators/alert.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/indicators/arrow-down.png
b/src/styles/images/indicators/arrow-down.png
deleted file mode 100644
index 64e3bac..0000000
--- a/src/styles/images/indicators/arrow-down.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/indicators/arrow-ltr.png
b/src/styles/images/indicators/arrow-ltr.png
deleted file mode 100644
index 4eafd0f..0000000
--- a/src/styles/images/indicators/arrow-ltr.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/indicators/arrow-rtl.png
b/src/styles/images/indicators/arrow-rtl.png
deleted file mode 100644
index ce13ba0..0000000
--- a/src/styles/images/indicators/arrow-rtl.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/indicators/arrow-up.png
b/src/styles/images/indicators/arrow-up.png
deleted file mode 100644
index 401cde6..0000000
--- a/src/styles/images/indicators/arrow-up.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/indicators/required.png
b/src/styles/images/indicators/required.png
deleted file mode 100644
index d10e0d4..0000000
--- a/src/styles/images/indicators/required.png
+++ /dev/null
Binary files differ
diff --git a/src/styles/images/textures/transparency.png
b/src/styles/images/textures/transparency.png
deleted file mode 100644
index b8e36d3..0000000
--- a/src/styles/images/textures/transparency.png
+++ /dev/null
Binary files differ
--
To view, visit https://gerrit.wikimedia.org/r/158386
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ida886f1348f3e8d9537b6f1dc2f1ea14bf5c2c06
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
