Merge branch 'wip-1.1.0' of github.com:ForkAwesome/Fork-Awesome into wip-1.1.0

README.md

@@ -67,6 +67,7 @@ to the `dependencies` in your `component.json`.
 - Ruby Development Headers
   - **Ubuntu:** `sudo apt-get install ruby-dev` *(Only if you're __NOT__ using `rbenv` or `rvm`)*
   - **Windows:** [DevKit](http://rubyinstaller.org/)
+  - **macOS:** no extra step required
 - [Bundler](http://bundler.io/) (Run `gem install bundler` to install).
 - [Node Package Manager (aka. `npm`)](https://docs.npmjs.com/getting-started/installing-node)
 
@@ -83,7 +84,7 @@ Build the web documentation:
 
     $ npm run build
 
-Or serve it on a local server on http://localhost:7998/Fork-Awesome/:
+Or serve it on a local server (http://localhost:7998):
 
     $ npm run dev
 

src/icons/.fontcustom-manifest.json

@@ -1,7 +1,7 @@
 {
   "checksum": {
-    "previous": "ac00bab72106d29e87bd4611b91a455e3646ae11d2d2899e6c601fdffe47f047",
+    "previous": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c",
-    "current": "ac00bab72106d29e87bd4611b91a455e3646ae11d2d2899e6c601fdffe47f047"
+    "current": "5ba8f7738f5ba72f24cefb1362ac0a1ac22cccd5d7054192255cd1d3c3e32d5c"
   },
   "fonts": [
     "forkawesome/forkawesome.ttf",
@@ -947,6 +947,10 @@
       "codepoint": 61826,
       "source": "svg/female.svg"
     },
+    "ffmpeg": {
+      "codepoint": 62223,
+      "source": "svg/ffmpeg.svg"
+    },
     "fighter-jet": {
       "codepoint": 61691,
       "source": "svg/fighter-jet.svg"
@@ -1207,6 +1211,10 @@
       "codepoint": 62183,
       "source": "svg/gnu-social.svg"
     },
+    "gnupg": {
+      "codepoint": 62221,
+      "source": "svg/gnupg.svg"
+    },
     "google": {
       "codepoint": 61856,
       "source": "svg/google.svg"
@@ -1879,6 +1887,10 @@
       "codepoint": 61592,
       "source": "svg/phone-square.svg"
     },
+    "php": {
+      "codepoint": 62222,
+      "source": "svg/php.svg"
+    },
     "picture-o": {
       "codepoint": 61502,
       "source": "svg/picture-o.svg"

src/icons/icons.yml

@@ -7003,5 +7003,27 @@ icons:
     filter:
       - message
       - texting
+
+  - name:       GnuPG
+    id:         gnupg
+    unicode:    f30d
+    created:    1.0
+    url:        gnupg.org
+    categories:
+      - Brand Icons
+
+  - name:       PHP
+    id:         php
+    unicode:    f30e
+    created:    1.0
+    url:        php.net
+    categories:
+      - Brand Icons
+
+  - name:       FFmpeg
+    id:         ffmpeg
+    unicode:    f30f
+    created:    1.0
+    url:        ffmpeg.org
     categories:
       - Brand Icons

src/icons/svg/ffmpeg.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792">
+    <path d="M1157.502 1212.925v-179.221l-529.947 527.003L0 1507.575 1010.292 408.332l-167.62 9.9-729.58 809.417V539.93l68.643-82.63-168.763 9.976V282.32l591.406-50.06-325.036 379.08v160.412l482.781-552.845L1536 153.41 401.6 1346.681l149.622 8.632 823.86-849.044v805.939l-92.149 86.59 234.08 13.835V1636l-730.747-61.89z"/>
+</svg>

src/icons/svg/gnupg.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792">
+    <path d="M190 869.324h81.273V624.678C271.273 350.42 493.69 128 767.944 128c274.262 0 496.672 222.42 496.672 496.68v242.23c-1.177.824-2.345 1.625-3.495 2.415h.01l-.753.507-.074.106h-.159l-.374.264-.446.296-.085.106-.483.338h-.021l-.191.117-.11.105-.242.148h-.053l-.296.19-.292.19-.4.265-.188.116-.16.117-.136.105-.449.296-.431.296h-.021l-.563.37-.123.106-.682.454h-.063l-.277.19h-.011l-.106.106-.895.582-.143.105-.194.117H1252.562l-.461.296h-.042l-.011.01h-.021l-.529.338-.112.106-.168.116-.16.116-.12.106-.277.19-.262.148h-.021l-.277.19h-.032l-.247.148h-.074l-.199.117-.128.105-.15.106-.176.116-.096.106-1.509.951-.322.19h-.074l-.806.497h-.063l-.917.56h-.084l-.25.149-.012.01-.266.148h-.032l-.233.148-.225.148h-.032l-.124.105-.397.222-.214.117-.303.19-.888.528-.888.518-.891.529-.895.528-1.806 1.057-.905.529-.91.529-.379.221-2.378 1.375-.925.539-.933.528-.936.54-1.225.697-1.603.91-.951.538-3.697 2.075-.153.106-.974.539-.978.54-.213.115-1.3.72-2.91 1.598-1.367.751a626.977 626.977 0 0 1-4.236 2.289l-.364.19-.667.338-2.071 1.105-1.041.55-.177.105-1.914 1.015h-.01l-1.06.55-.303.148-1.828.95-1.067.55-.986.508c-1.337.687-2.685 1.386-4.048 2.078l-1.117.56c-1.599.814-3.217 1.63-4.854 2.442l-.01.01c-1.563.772-3.14 1.555-4.731 2.334l-1.577.772c-1.73.835-3.472 1.685-5.24 2.531h-.01c-98.633 47.119-256.812 97.247-557.097 118.807-215.15 15.456-345.56 110.137-430.615 224.404V869.034zm310.05 0h535.792V624.678c0-147.939-119.963-267.903-267.898-267.903-147.927 0-267.894 119.964-267.894 267.903v244.646zm694.053 38.582a744.265 744.265 0 0 1-4.854 2.442M992.942 248.154c-63.692-38.058-138.155-59.957-217.72-59.957-218.103 0-397.881 164.328-422.34 375.875 63.94-200.033 251.367-344.939 472.589-344.939 58.766 0 115.147 10.252 167.47 29.02zm352.95 714.811V1664H356.977c109.011-60.612 190.258-54.44 324.818-50.186 183.247 5.795 385.727-70.968 485.307-172.614 99.592-101.655-9.015-24.053-121.75 4.544-112.753 28.586-330.927 31.627-476.764-6.704 459.322 6.259 638.081-142.324 739.599-275.389 101.513-133.066-43.905-23.103-138.107 22.768-94.199 45.916-258.49 78.719-439.148 54.797 273.456-.56 481.524-137.22 614.96-278.25z" class="fil0" clip-rule="evenodd" fill-rule="evenodd" image-rendering="optimizeQuality" shape-rendering="geometricPrecision" text-rendering="geometricPrecision"/>
+</svg>

src/icons/svg/php.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792">
+    <path d="M767.998 492.007C343.85 492.007 0 672.887 0 896.003 0 1119.123 343.851 1300 767.998 1300 1192.144 1300 1536 1119.122 1536 896.003c0-223.116-343.856-403.996-768.002-403.996zM701.032 601.59h83.238L760.745 712.9h74.796c41.017.781 71.574 8.942 91.684 24.48 20.509 15.536 26.544 45.07 18.099 88.58l-40.417 194.066h-84.444l38.602-185.32c4.018-19.43 2.81-33.222-3.62-41.38-6.43-8.16-20.302-12.24-41.618-12.24l-66.953-.582-49.462 239.522H614.17l86.862-418.436zM319.609 712.9h161.653c47.447.385 81.83 13.604 103.147 39.631 21.316 26.027 28.35 61.577 21.11 106.65-2.81 20.595-9.046 40.792-18.697 60.607-9.253 19.815-22.111 37.687-38.602 53.62-20.11 20.2-41.623 33.02-64.545 38.463-22.92 5.443-46.65 8.155-71.176 8.155h-72.382l-22.921 110.73H233.35L319.61 712.9zm715.099 0h161.657c47.447.385 81.83 13.604 103.147 39.631 21.316 26.027 28.35 61.577 21.11 106.65-2.81 20.595-9.05 40.792-18.701 60.607-9.253 19.815-22.112 37.687-38.603 53.62-20.11 20.2-41.618 33.02-64.54 38.463-22.92 5.443-46.65 8.155-71.176 8.155h-72.387l-22.92 110.73h-83.842l86.255-417.856zm-618.589 66.441c-4.825.385-9.444.582-13.871.582H390.06l-36.068 174.253c2.413.385 4.823.581 7.236.581h8.446c38.604.385 70.778-3.298 96.51-11.072 25.732-8.158 43.032-36.517 51.875-85.086 7.238-40.795 0-64.304-21.714-70.517-21.317-6.212-48.052-9.126-80.226-8.74zm715.099 0c-4.826.385-9.445.582-13.872.582h-12.187l-36.068 174.253a45.9 45.9 0 0 0 7.24.581h8.441c38.605.385 70.778-3.298 96.51-11.072 25.733-8.158 43.033-36.517 51.876-85.086 7.238-40.795 0-64.304-21.715-70.517-21.316-6.212-48.051-9.126-80.225-8.74z"/>
+</svg>