@girder/fontello 3.1.10 → 3.1.13

package/.fontello-session

@@ -0,0 +1 @@
+cd26241ed118c852f5b6aeb11fe9924c

package/Gruntfile.js

@@ -1,29 +1,26 @@
 module.exports = function (grunt) {
     grunt.initConfig({
-        clean: [
-            'dist'
-        ],
-        fontello: {
+        clean: {
+            dist: ['dist', '.fontello-session'],
+            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/README.md

@@ -26,7 +26,7 @@ import '@girder/fontello/dist/css/animation.css';
 
 # Updating
 To add new icons to this build, visit
-[Fontello's website](http://fontello.com) and upload the
+[Fontello's website](https://fontello.com) and upload the
 `fontello.config.json` file within this package. Select new icons
 (but don't remove any), then download the new confguration via the site
 and overwrite `fontello.config.json` here. Then, just run:

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?5929696');
+  src: url('../fonts/fontello.eot?5929696#iefix') format('embedded-opentype'),
+       url('../fonts/fontello.woff2?5929696') format('woff2'),
+       url('../fonts/fontello.woff?5929696') format('woff'),
+       url('../fonts/fontello.ttf?5929696') format('truetype'),
+       url('../fonts/fontello.svg?5929696#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?5929696#fontello') format('svg');
   }
 }
 */
@@ -443,3 +443,7 @@
 .icon-github:before { content: '\e982'; } /* '' */
 .icon-codeopen:before { content: '\e983'; } /* '' */
 .icon-connectdevelop:before { content: '\e984'; } /* '' */
+.icon-microsoft:before { content: '\e985'; } /* '' */
+.icon-google:before { content: '\e986'; } /* '' */
+.icon-draw-polygon:before { content: '\e987'; } /* '' */
+.icon-box-brand:before { content: '\e988'; } /* '' */

package/dist/fonts/fontello.svg

@@ -783,6 +783,14 @@
 <glyph glyph-name="codeopen" unicode="&#xe983;" d="M121 198l336-225v201l-186 124z m-35 80l108 72-108 72v-144z m457-305l337 225-151 100-186-124v-201z m-43 275l152 102-152 102-152-102z m-229 154l186 124v201l-336-225z m535-52l108-72v144z m-77 52l151 100-337 225v-201z m271 100v-304q0-23-19-36l-457-305q-12-7-24-7t-24 7l-457 305q-19 13-19 36v304q0 23 19 36l457 305q12 7 24 7t24-7l457-305q19-13 19-36z" horiz-adv-x="1000" />
 
 <glyph glyph-name="connectdevelop" unicode="&#xe984;" d="M1143 351q0-12-7-21t-19-11l-114-198q2-5 2-10 0-12-7-20t-19-11l-107-188q1-5 1-9 0-13-9-22t-22-10q-14 0-23 10h-224q-9-11-24-11t-24 11h-222q-10-11-24-11-13 0-22 9t-10 23q0 4 2 11l-107 187q-12 2-19 11t-7 20q0 5 2 10l-115 198q-11 3-18 12t-7 20q0 11 8 20t18 11l111 192q0 0 0 1t0 2q0 20 19 29l116 202q-2 6-2 10 0 14 10 23t22 9q14 0 25-12h220q9 12 24 12t24-12h223q10 12 24 12 13 0 22-9t10-23q0-3-2-10l115-200q13 0 22-9t9-22q0-7-4-15l104-181q11-2 18-11t7-19z m-550-446h217l-191 197h-79l-191-197h201q10 9 21 9t22-9z m-530 453q0-2 0-7 0-6-1-9l116-201 8-3 105 111v194l-104 108q-7-5-16-6z m487 437h-216l106-111 309 111h-156q-9-9-22-9t-21 9z m393-676q0 3 2 6l-35 38-10-44h43z m-60 0l13 59-141 148-165-171 35-36h258z m-49-205l9 15 37 173h-239l186-191q5 2 7 3z m-511-9h2l191 197h-208v-187l2-3q8-3 13-7z m-15 214h224l36 37-172 179-88-93v-123z m-108 0h91v105l-93-98q2-5 2-7z m0 460q0 0 0-1t0-1q0-9-4-16l95-99v150z m108 39v-173l85-88 166 176-124 131z m2 170l-2-4v-148l114 42-106 112q-3-1-6-2z m498 7h-9l-347-125 119-125z m-237-274l-166-176 174-178 165 171z m-187-174l-76 78v-158z m195-203l-23-25h47z m188 194l133-140 73 348-1 3-1 0z m192 223q-5 7-5 16v1l-120 210q-3 1-7 3l-244-258 173-183z m-668 69v125l-91-158z m0-528h-91l91-158v158z m606 0l-27-126 73 126h-46z m68 39l115 202q-1 5-1 8 0 0 2 9l-95 165-72-342 43-46q2 2 8 4z" horiz-adv-x="1142.9" />
+
+<glyph glyph-name="microsoft" unicode="&#xe985;" d="M0 788h419v-420h-419v420z m456 0h419v-420h-419v420z m-456-456h419v-420h-419v420z m456 0h419v-420h-419v420z" horiz-adv-x="875" />
+
+<glyph glyph-name="google" unicode="&#xe986;" d="M953 339c0-277-189-473-469-473-268 0-484 216-484 484s216 484 484 484c131 0 241-47 325-126l-132-127c-172 166-493 41-493-231 0-169 135-306 300-306 192 0 264 138 275 209h-275v167h462c4-25 7-49 7-81z" horiz-adv-x="953" />
+
+<glyph glyph-name="draw-polygon" unicode="&#xe987;" d="M751 163c68-1 124-57 124-125 0-69-56-126-125-126-46 0-87 26-108 63h-409c-21-37-62-63-108-63-69 0-125 57-125 126 0 46 25 86 63 108v408c-38 22-63 62-63 109 0 69 56 125 125 125 46 0 87-26 108-63h409c21 37 62 63 108 63 69 0 125-56 125-125 0-69-56-125-124-124l-76-134c8-17 13-35 13-55 0-20-5-38-13-55l76-132z m-563-17c18-11 34-27 45-46h409c0 0 0 0 0 1l-71 124c-3 2-6 0-8 0-69 0-125 56-125 125 0 69 56 125 125 125 2 0 5 0 8 0l71 124 0 1h-409c-11-19-27-35-45-46l0-408z" horiz-adv-x="875" />
+
+<glyph glyph-name="box-brand" unicode="&#xe988;" d="M536 485c-74 0-138-42-170-102-32 60-96 102-170 102-43 0-83-15-115-39l0 162 0 0c0 21-17 38-38 38-21 0-38-17-38-38l-1 0 0-319 1 0c1-104 87-188 191-188 74 0 138 41 170 102 32-61 96-102 170-102 106 0 192 86 192 192 0 106-86 192-192 192z m-340-308c-63 0-115 52-115 116 0 63 52 115 115 115 64 0 116-52 116-115 0-64-52-116-116-116z m340 0c-64 0-115 52-115 116 0 63 51 115 115 115 63 0 115-52 115-115 0-64-52-116-115-116z m450-16l-98 132 98 131 0 0c12 17 9 41-8 53-17 13-41 9-53-7l0 0-85-113-85 113 0 0c-13 16-37 20-54 7-16-12-20-36-8-53l0 0 99-131-99-132 0 0c-12-17-8-40 8-53 17-13 41-9 54 7l0 0 85 113 85-113 0 0c12-16 36-20 53-7 17 13 20 36 8 53l0 0z" horiz-adv-x="1000" />
 </font>
 </defs>
 </svg>

package/fontello.config.json

@@ -2339,6 +2339,62 @@
       "css": "connectdevelop",
       "code": 59780,
       "src": "fontawesome"
+    },
+    {
+      "uid": "e1fe00b0dea8d5e6cfe324ca801e0305",
+      "css": "microsoft",
+      "code": 59781,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M0 62.5H419.1V481.6H0V62.5ZM455.9 62.5H875V481.6H455.9V62.5ZM0 518.4H419.1V937.5H0V518.4ZM455.9 518.4H875V937.5H455.9V518.4Z",
+        "width": 875
+      },
+      "search": [
+        "microsoft"
+      ]
+    },
+    {
+      "uid": "29c9f1d40c2d9ed1177c8b808574f4f0",
+      "css": "google",
+      "code": 59782,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M953.1 511.3C953.1 787.7 763.9 984.4 484.4 984.4 216.4 984.4 0 768 0 500S216.4 15.6 484.4 15.6C614.8 15.6 724.6 63.5 809.2 142.4L677.3 269.1C504.9 102.7 184.2 227.7 184.2 500 184.2 668.9 319.1 805.9 484.4 805.9 676.2 805.9 748 668.4 759.4 597.1H484.4V430.5H945.5C950 455.3 953.1 479.1 953.1 511.3Z",
+        "width": 953
+      },
+      "search": [
+        "google"
+      ]
+    },
+    {
+      "uid": "443344911446865e5ecb110d11eb887c",
+      "css": "draw-polygon",
+      "code": 59783,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M750.6 687.5C819.3 687.9 875 743.6 875 812.5 875 881.4 818.9 937.5 750 937.5 703.7 937.5 663.3 912.3 641.8 875H233.2C211.7 912.3 171.3 937.5 125 937.5 56 937.5 0 881.4 0 812.5 0 766.2 25.1 725.8 62.5 704.3V295.7C25.1 274.2 0 233.8 0 187.5 0 118.5 56 62.5 125 62.5 171.3 62.5 211.7 87.6 233.2 125H641.8C663.3 87.6 703.7 62.5 750 62.5 818.9 62.5 875 118.5 875 187.5 875 256.4 819.3 312.1 750.6 310.7L674.8 445.1C683 461.7 687.5 480.3 687.5 500 687.5 519.7 683 538.3 674.8 554.9L750.6 687.5ZM187.5 704.3C206.4 715.2 222.3 731.1 233.2 750H641.8C641.8 749.8 642 749.6 642 749.4L570.7 624.8C568 623.2 565.2 625 562.5 625 493.6 625 437.5 568.9 437.5 500 437.5 431.1 493.6 375 562.5 375 565.2 375 568 375 570.7 375.2L642 250.6 641.8 250H233.2C222.3 268.9 206.4 284.8 187.5 295.7L187.5 704.3Z",
+        "width": 875
+      },
+      "search": [
+        "draw-polygon"
+      ]
+    },
+    {
+      "uid": "82baef1a0cf7bc2c48fd6e055c7dbe3d",
+      "css": "box-brand",
+      "code": 59784,
+      "src": "custom_icons",
+      "selected": true,
+      "svg": {
+        "path": "M535.6 365.4C462.1 365.4 398.3 406.7 366 467.4 333.8 406.7 270 365.4 196.4 365.4 153.2 365.4 113.4 379.7 81.3 403.8L81.3 242 81.3 242C80.8 221.2 63.8 204.4 42.9 204.4 21.9 204.4 4.9 221.2 4.5 242.1L4.4 242.1 4.4 560.6 4.5 560.6C6.2 665.1 91.5 749.4 196.4 749.4 269.9 749.4 333.8 708 366 647.4 398.3 708 462.1 749.4 535.6 749.4 641.7 749.4 727.6 663.4 727.6 557.4 727.6 451.4 641.7 365.4 535.6 365.4ZM196.4 672.6C132.8 672.6 81.3 621 81.3 557.4 81.3 493.8 132.8 442.2 196.4 442.2 260 442.2 311.6 493.8 311.6 557.4 311.6 621 260 672.6 196.4 672.6ZM535.6 672.6C472 672.6 420.5 621 420.5 557.4 420.5 493.8 472 442.2 535.6 442.2 599.2 442.2 650.8 493.8 650.8 557.4 650.8 621 599.2 672.6 535.6 672.6ZM985.9 689L887.6 557.5 985.9 426.1 985.9 426.1C998 409.2 994.5 385.5 977.8 373 961 360.4 937.3 363.6 924.5 380L924.5 380 839.6 493.4 754.7 380 754.7 380C741.8 363.6 718.2 360.4 701.4 373 684.7 385.5 681.2 409.2 693.3 426.1L693.3 426.1 791.6 557.5 693.3 689 693.3 689C681.2 705.9 684.7 729.5 701.4 742.1 718.2 754.7 741.8 751.5 754.7 735.1L754.7 735.1 839.6 621.7 924.5 735.1 924.5 735.1C937.4 751.5 961 754.7 977.8 742.1 994.5 729.5 998 705.9 985.9 689L985.9 689Z",
+        "width": 1000
+      },
+      "search": [
+        "box-brand"
+      ]
     }
   ]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@girder/fontello",
-  "version": "3.1.10",
+  "version": "3.1.13",
   "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",