From: Nicolas LÅ“uillet Date: Fri, 24 Jun 2016 12:23:38 +0000 (+0200) Subject: Merge pull request #2170 from wallabag/addTagsOnEntriesView X-Git-Tag: 2.1.0~67 X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=33e2aec18b25d2c47774fede22ecd91e936b4400;hp=eef833d644f90518c712eccac7805d99562fd263;p=github%2Fwallabag%2Fwallabag.git Merge pull request #2170 from wallabag/addTagsOnEntriesView Add tags on entries view and minor ui fixes --- diff --git a/Gruntfile.js b/Gruntfile.js index 04fd1fe8..c7419549 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -158,7 +158,7 @@ module.exports = function (grunt) { { expand: true, overwrite: true, - cwd: '<%= appDir %>/lib/material-design-icons/iconfont/', + cwd: '<%= appDir %>/lib/material-design-icons-iconfont/dist/fonts/', src: '*', dest: '<%= buildDir %>/themes/material/fonts/', }, diff --git a/bower.json b/bower.json index aa529bd3..f2d2bd26 100644 --- a/bower.json +++ b/bower.json @@ -33,6 +33,7 @@ "dependencies": { "icomoon-bower": "^0.1.0", "bower-pt-sans": "pt-sans#*", - "roboto-fontface": "^0.4.5" + "roboto-fontface": "^0.4.5", + "material-design-icons-iconfont": "^2.0.4" } }