@girder/fontello 3.1.10 → 3.1.11

package/.fontello-session

@@ -0,0 +1 @@
+c5db7ad5a8e1011a99beeccc16ecd9e0

package/Gruntfile.js

@@ -1,29 +1,26 @@
 module.exports = function (grunt) {
     grunt.initConfig({
-        clean: [
-            'dist'
-        ],
-        fontello: {
+        clean: {
+            dist: ['dist'],
+            extra: [
+                'dist/css/fontello-codes.css',
+                'dist/css/fontello-embedded.css',
+                'dist/css/fontello-ie7.css',
+                'dist/css/fontello-ie7-codes.css'
+            ]
+        },
+        shell: {
             dist: {
-                options: {
-                    host: 'https://fontello.com',
-                    config: 'fontello.config.json',
-                    fonts: 'dist/fonts',
-                    styles: 'dist/css',
-                    exclude: [
-                        'fontello-codes.css',
-                        'fontello-embedded.css',
-                        'fontello-ie7.css',
-                        'fontello-ie7-codes.css'
-                    ],
-                    force: true
-                }
+                command: 'fontello-cli install --config fontello.config.json --css dist/css --font dist/fonts --host https://fontello.com'
+            },
+            adjust: {
+                command: "sed -i 's/\\/font\\//\\/fonts\\//g' dist/css/fontello.css"
             }
         }
     });
 
     grunt.loadNpmTasks('grunt-contrib-clean');
-    grunt.loadNpmTasks('grunt-fontello');
+    grunt.loadNpmTasks('grunt-shell');
 
-    grunt.registerTask('default', ['clean', 'fontello']);
+    grunt.registerTask('default', ['clean:dist', 'shell:dist', 'shell:adjust', 'clean:extra']);
 };

package/dist/css/fontello.css

@@ -1,11 +1,11 @@
 @font-face {
   font-family: 'fontello';
-  src: url('../font/fontello.eot?98605011');
-  src: url('../font/fontello.eot?98605011#iefix') format('embedded-opentype'),
-       url('../font/fontello.woff2?98605011') format('woff2'),
-       url('../font/fontello.woff?98605011') format('woff'),
-       url('../font/fontello.ttf?98605011') format('truetype'),
-       url('../font/fontello.svg?98605011#fontello') format('svg');
+  src: url('../fonts/fontello.eot?45624285');
+  src: url('../fonts/fontello.eot?45624285#iefix') format('embedded-opentype'),
+       url('../fonts/fontello.woff2?45624285') format('woff2'),
+       url('../fonts/fontello.woff?45624285') format('woff'),
+       url('../fonts/fontello.ttf?45624285') format('truetype'),
+       url('../fonts/fontello.svg?45624285#fontello') format('svg');
   font-weight: normal;
   font-style: normal;
 }
@@ -15,7 +15,7 @@
 @media screen and (-webkit-min-device-pixel-ratio:0) {
   @font-face {
     font-family: 'fontello';
-    src: url('../font/fontello.svg?98605011#fontello') format('svg');
+    src: url('../fonts/fontello.svg?45624285#fontello') format('svg');
   }
 }
 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@girder/fontello",
-  "version": "3.1.10",
+  "version": "3.1.11",
   "description": "Built Fontello files for use in Girder.",
   "license": "Apache-2.0",
   "repository": {
@@ -16,9 +16,10 @@
     "prepublishOnly": "$npm_execpath install && $npm_execpath run build"
   },
   "devDependencies": {
+    "fontello-cli": "^0.6.2",
     "grunt": "^1.0.3",
     "grunt-contrib-clean": "^2.0.0",
-    "grunt-fontello": "^0.3.7"
+    "grunt-shell": "^4.0.0"
   },
   "keywords": [
     "fontello",