Merge branch 'jerrykan-matrix_org'

2024-12-25 21:11:32 +08:00 · 2018-10-08 15:00:35 -04:00 · 2018-10-08 15:00:35 -04:00 · e555fa2319
commit e555fa2319
parent 7ed34f8fe7 748822055b
17 changed files with 48 additions and 10 deletions
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@ -970,6 +970,15 @@
      "contributions": [
        "doc"
      ]
+    },
+    {
+      "login": "jerrykan",
+      "name": "John Kristensen",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/377632?v=4",
+      "profile": "http://www.jerrykan.com/",
+      "contributions": [
+        "design"
+      ]
    }
  ]
 }
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@ -24,6 +24,7 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
 | [<img src="https://avatars0.githubusercontent.com/u/77144?v=4" width="50px;"/><br /><sub><b>Luca Trevisani</b></sub>](https://github.com/luke83)<br />[💻](https://github.com/ForkAwesome/Fork-Awesome/commits?author=luke83 "Code") | [<img src="https://avatars3.githubusercontent.com/u/1706326?v=4" width="50px;"/><br /><sub><b>Álvaro</b></sub>](http://alvarotrigo.com)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=alvarotrigo "Documentation") | [<img src="https://avatars3.githubusercontent.com/u/192539?v=4" width="50px;"/><br /><sub><b>Julien Deswaef</b></sub>](http://xuv.be)<br />[💻](https://github.com/ForkAwesome/Fork-Awesome/commits?author=xuv "Code") [🎨](#design-xuv "Design") [📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=xuv "Documentation") [💬](#question-xuv "Answering Questions") | [<img src="https://avatars0.githubusercontent.com/u/2192132?v=4" width="50px;"/><br /><sub><b>n8willis</b></sub>](https://github.com/n8willis)<br />[🤔](#ideas-n8willis "Ideas, Planning, & Feedback") | [<img src="https://avatars0.githubusercontent.com/u/1779453?v=4" width="50px;"/><br /><sub><b>B. Howell</b></sub>](http://wintermute.org/brendan)<br />[🤔](#ideas-brendanhowell "Ideas, Planning, & Feedback") | [<img src="https://avatars2.githubusercontent.com/u/1197187?v=4" width="50px;"/><br /><sub><b>Algot Runeman</b></sub>](http://runeman.org)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=algotruneman "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/10608836?v=4" width="50px;"/><br /><sub><b>Micah Ilbery</b></sub>](https://micahilbery.com/)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=micahilbery "Documentation") [🎨](#design-micahilbery "Design") |
 | [<img src="https://avatars3.githubusercontent.com/u/223439?v=4" width="50px;"/><br /><sub><b>Helmut K. C. Tessarek</b></sub>](https://evermeet.cx)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=tessus "Documentation") [💻](https://github.com/ForkAwesome/Fork-Awesome/commits?author=tessus "Code") [🎨](#design-tessus "Design") | [<img src="https://avatars0.githubusercontent.com/u/3597194?v=4" width="50px;"/><br /><sub><b>jeromelebleu</b></sub>](https://github.com/jeromelebleu)<br />[💻](https://github.com/ForkAwesome/Fork-Awesome/commits?author=jeromelebleu "Code") | [<img src="https://avatars3.githubusercontent.com/u/630909?v=4" width="50px;"/><br /><sub><b>Kimberly Zick</b></sub>](https://zick.kim/)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=rummik "Documentation") | [<img src="https://avatars2.githubusercontent.com/u/13441278?v=4" width="50px;"/><br /><sub><b>nIQnutn</b></sub>](http://blog.niqnutn.com/)<br />[📝](#blog-nIQnutn "Blogposts") [🔌](#plugin-nIQnutn "Plugin/utility libraries") | [<img src="https://avatars1.githubusercontent.com/u/4307697?v=4" width="50px;"/><br /><sub><b>Jaime Leonardo Suncin Cruz</b></sub>](https://github.com/leosuncin)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=leosuncin "Documentation") | [<img src="https://avatars0.githubusercontent.com/u/1770233?v=4" width="50px;"/><br /><sub><b>Juliette Foucaut</b></sub>](https://www.enkisoftware.com)<br />[🔌](#plugin-juliettef "Plugin/utility libraries") | [<img src="https://avatars1.githubusercontent.com/u/6379091?v=4" width="50px;"/><br /><sub><b>Dominik V. Salonen</b></sub>](http://quad.moe/)<br />[📝](#blog-QuadPiece "Blogposts") |
 | [<img src="https://avatars2.githubusercontent.com/u/2706882?v=4" width="50px;"/><br /><sub><b>Alexandre Viau</b></sub>](https://alexandreviau.net)<br />[🤔](#ideas-aviau "Ideas, Planning, & Feedback") [📦](#platform-aviau "Packaging/porting to new platform") | [<img src="https://avatars3.githubusercontent.com/u/7915413?v=4" width="50px;"/><br /><sub><b>Xesau</b></sub>](http://xesau.eu/)<br />[🐛](https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3AXesau "Bug reports") | [<img src="https://avatars0.githubusercontent.com/u/649895?v=4" width="50px;"/><br /><sub><b>Jan Hohner</b></sub>](https://janhohner.de)<br />[🐛](https://github.com/ForkAwesome/Fork-Awesome/issues?q=author%3Ajanhohner "Bug reports") | [<img src="https://avatars0.githubusercontent.com/u/261579?v=4" width="50px;"/><br /><sub><b>Dave Crossland</b></sub>](http://fonts.google.com)<br />[👀](#review-davelab6 "Reviewed Pull Requests") | [<img src="https://avatars0.githubusercontent.com/u/8260834?v=4" width="50px;"/><br /><sub><b>Maximilian Berkmann</b></sub>](http://maxcubing.wordpress.com)<br />[🤔](#ideas-Berkmann18 "Ideas, Planning, & Feedback") | [<img src="https://avatars2.githubusercontent.com/u/616813?v=4" width="50px;"/><br /><sub><b>Moritz Heiber</b></sub>](https://heiber.im)<br />[🚇](#infra-moritzheiber "Infrastructure (Hosting, Build-Tools, etc)") | [<img src="https://avatars1.githubusercontent.com/u/21787?v=4" width="50px;"/><br /><sub><b>Wesley Moore</b></sub>](http://www.wezm.net/)<br />[📖](https://github.com/ForkAwesome/Fork-Awesome/commits?author=wezm "Documentation") |
+| [<img src="https://avatars0.githubusercontent.com/u/377632?v=4" width="50px;"/><br /><sub><b>John Kristensen</b></sub>](http://www.jerrykan.com/)<br />[🎨](#design-jerrykan "Design") |
 <!-- ALL-CONTRIBUTORS-LIST:END -->

 This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
--- a/README.md
+++ b/README.md
@ -1,12 +1,12 @@
 # Fork Awesome
 ### A fork of the iconic font and CSS toolkit

-[![All Contributors](https://img.shields.io/badge/all_contributors-105-orange.svg?style=flat-square)](CONTRIBUTORS.md)
+[![All Contributors](https://img.shields.io/badge/all_contributors-106-orange.svg?style=flat-square)](CONTRIBUTORS.md)
 [![JSDeliver](https://data.jsdelivr.com/v1/package/npm/fork-awesome/badge)](https://www.jsdelivr.com/package/npm/fork-awesome)
 [![CDNJS](https://img.shields.io/cdnjs/v/fork-awesome.svg?style=flat-square)](https://cdnjs.com/libraries/fork-awesome)
 [![Build Status](https://travis-ci.org/ForkAwesome/Fork-Awesome.svg?branch=master)](https://travis-ci.org/ForkAwesome/Fork-Awesome)

-Fork Awesome is a full suite of 720 pictographic icons for easy scalable vector graphics on websites, originally created by [Dave Gandy](https://twitter.com/davegandy) and now maintained by a community.
+Fork Awesome is a full suite of 721 pictographic icons for easy scalable vector graphics on websites, originally created by [Dave Gandy](https://twitter.com/davegandy) and now maintained by a community.

 Following concerns regarding [the development of Font Awesome](https://github.com/FortAwesome/Font-Awesome/issues/12199#issuecomment-362919956), the PR Freeze since Oct 2016 and the direction [Fort Awesome](https://fortawesome.com/) is taking with the version 5.0 of their project, we are forking Font Awesome (4.7), in order to build on this amazing tool Dave Gandy has given us, while at the same time allowing this project to be run by a distributed community of contributors.

--- a/css/fork-awesome.css
+++ b/css/fork-awesome.css
@ -2480,6 +2480,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 .fa-inkscape:before {
  content: "\f312";
 }
+.fa-matrix-org:before {
+  content: "\f313";
+}
 .sr-only {
  position: absolute;
  width: 1px;
--- a/css/fork-awesome.min.css
+++ b/css/fork-awesome.min.css
--- a/css/fork-awesome.min.css.map
+++ b/css/fork-awesome.min.css.map
--- a/fonts/forkawesome-webfont.eot
+++ b/fonts/forkawesome-webfont.eot
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@ -1,11 +1,11 @@
 <?xml version="1.0" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
 <!--
-2018-10-4: Created with FontForge (http://fontforge.org)
+2018-10-8: Created with FontForge (http://fontforge.org)
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20180321 at Thu Oct  4 17:05:43 2018
+Created by FontForge 20180321 at Mon Oct  8 14:52:39 2018
 By Julien Deswaef
 The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/OFL). Fork Awesome is a fork based of off Font Awesome 4.7.0 by Dave Gandy. More info on licenses at https://forkawesome.github.io
 </metadata>
@ -22,7 +22,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
    bbox="-0.653061 -264 2304.01 1536.25"
    underline-thickness="89.6"
    underline-position="-179.2"
-    unicode-range="U+0020-F312"
+    unicode-range="U+0020-F313"
  />
    <missing-glyph />
    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@ -1430,6 +1430,10 @@ s-29 -16 -64 -16h-69l293 -352h64l224 -64l352 -32c288 -64 288 -96 288 -96z" />
 d="M620 416c-69 -40 -163 -64 -268 -64h-128v64h-64c-18 0 -32 36 -32 80c0 18 3 35 7 49c-77 2 -135 15 -135 31s58 29 135 31c-4 14 -7 31 -7 49c0 44 14 80 32 80h64v64h128c105 0 199 -24 268 -64h1113c74 -13 141 -24 187 -32c192 -32 256 -96 256 -128
 s-64 -96 -256 -128c-46 -8 -113 -19 -187 -32h-1113zM1739 668c32 -22 53 -55 53 -92s-21 -70 -53 -92l81 -30c41 29 68 73 68 122s-27 93 -68 122zM625 400h1015s-217 -38 -456 -80c-128 0 -224 -96 -224 -96l-288 -288s-97 -64 -160 -64h-96l-93 464h29
 c102 0 199 23 273 64zM352 816h-29l93 464h96c65 0 128 -32 160 -64l288 -288s96 -96 224 -96c239 -42 456 -80 456 -80h-1015c-74 41 -171 64 -273 64z" />
+    <glyph glyph-name="matrix-org" unicode="&#xf313;" 
+d="M40 1373v-1466h106v-35h-146v1536h146v-35h-106zM491 908v-74h2c20 28 44 51 72 66c28 16 60 23 96 23c35 0 66 -7 95 -20s50 -37 65 -71c16 24 38 46 66 64s61 27 99 27c29 0 56 -4 81 -11s45 -18 63 -34s31 -35 41 -60s15 -56 15 -91v-367h-150v311c0 18 -1 36 -2 52
+s-6 30 -12 42s-16 22 -28 29s-29 10 -50 10s-38 -4 -51 -12s-24 -19 -31 -32s-13 -27 -15 -44s-4 -34 -4 -51v-305h-150v307c0 16 0 33 -1 49s-4 30 -9 44c-5 13 -15 24 -27 32s-31 12 -55 12c-7 0 -16 -2 -28 -5s-23 -9 -34 -18s-20 -21 -28 -38s-11 -38 -11 -65v-318h-151
+v548h142zM1496 -93v1466h-106v35h146v-1536h-146v35h106z" />
    <glyph glyph-name="steam" unicode="&#xf1b6;" horiz-adv-x="1792" 
 d="M1582 954c0 -135 -110 -244 -244 -244c-135 0 -244 109 -244 244s109 244 244 244c134 0 244 -109 244 -244zM812 212c0 139 -111 250 -250 250c-18 0 -36 -2 -54 -6l104 -42c102 -41 152 -156 111 -258s-157 -152 -259 -110c-41 16 -82 33 -123 49
 c42 -79 125 -133 221 -133c139 0 250 111 250 250zM1642 953c0 168 -137 305 -305 305c-169 0 -306 -137 -306 -305c0 -169 137 -305 306 -305c168 0 305 136 305 305zM1792 953c0 -252 -204 -455 -455 -455l-437 -319c-16 -172 -162 -307 -338 -307
--- a/fonts/forkawesome-webfont.ttf
+++ b/fonts/forkawesome-webfont.ttf
--- a/fonts/forkawesome-webfont.woff
+++ b/fonts/forkawesome-webfont.woff
--- a/fonts/forkawesome-webfont.woff2
+++ b/fonts/forkawesome-webfont.woff2
--- a/less/icons.less
+++ b/less/icons.less
@ -853,3 +853,4 @@
 .@{fa-css-prefix}-joplin:before { content: @fa-var-joplin; }
 .@{fa-css-prefix}-syncthing:before { content: @fa-var-syncthing; }
 .@{fa-css-prefix}-inkscape:before { content: @fa-var-inkscape; }
+.@{fa-css-prefix}-matrix-org:before { content: @fa-var-matrix-org; }
--- a/less/variables.less
+++ b/less/variables.less
@ -491,6 +491,7 @@
@fa-var-mastodon: "\f2e1";
@fa-var-mastodon-alt: "\f2e2";
@fa-var-mastodon-square: "\f300";
+@fa-var-matrix-org: "\f313";
@fa-var-maxcdn: "\f136";
@fa-var-meanpath: "\f20c";
@fa-var-medium: "\f23a";
--- a/src/doc/README.md-nobuild
+++ b/src/doc/README.md-nobuild
@ -3,7 +3,7 @@
 # {{ site.forkawesome.name }}
 ### {{ site.forkawesome.tagline }}

-[![All Contributors](https://img.shields.io/badge/all_contributors-105-orange.svg?style=flat-square)](CONTRIBUTORS.md)
+[![All Contributors](https://img.shields.io/badge/all_contributors-106-orange.svg?style=flat-square)](CONTRIBUTORS.md)
 [![JSDeliver](https://data.jsdelivr.com/v1/package/npm/fork-awesome/badge)](https://www.jsdelivr.com/package/npm/fork-awesome)
 [![CDNJS](https://img.shields.io/cdnjs/v/fork-awesome.svg?style=flat-square)](https://cdnjs.com/libraries/fork-awesome)
 [![Build Status](https://travis-ci.org/ForkAwesome/Fork-Awesome.svg?branch=master)](https://travis-ci.org/ForkAwesome/Fork-Awesome)
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@ -1,7 +1,7 @@
 {
  "checksum": {
-    "previous": "c15aa8ba8b70cd0348c7f9064a99c8a9b6aead271b46c68fd1be87e3391397b5",
-    "current": "c15aa8ba8b70cd0348c7f9064a99c8a9b6aead271b46c68fd1be87e3391397b5"
+    "previous": "eb21d0c5b7ffe821d5b7eb8fbbb112124db6b68cff3d65ef235618bc539eb0af",
+    "current": "eb21d0c5b7ffe821d5b7eb8fbbb112124db6b68cff3d65ef235618bc539eb0af"
  },
  "fonts": [
    "forkawesome/forkawesome.ttf",
@ -1671,6 +1671,10 @@
      "codepoint": 62208,
      "source": "svg/mastodon-square.svg"
    },
+    "matrix-org": {
+      "codepoint": 62227,
+      "source": "svg/matrix-org.svg"
+    },
    "maxcdn": {
      "codepoint": 61750,
      "source": "svg/maxcdn.svg"
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@ -7086,3 +7086,15 @@ icons:
    url:        inkscape.org
    categories:
      - Brand Icons
+
+  - name:       Matrix.org
+    id:         matrix-org
+    unicode:    f313
+    created:    1.1
+    url:        matrix.org
+    filter:
+      - chat
+      - federation
+      - message
+    categories:
+      - Brand Icons
--- a/src/icons/svg/matrix-org.svg
+++ b/src/icons/svg/matrix-org.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792" viewBox="0 0 1536 1792">
+    <path d="M40.467 163.152v1465.696H145.92V1664H0V128h145.92v35.152zm450.757 464.64v74.14h2.069c19.79-28.356 43.717-50.215 71.483-65.575 27.765-15.656 59.963-23.336 96-23.336 34.56 0 66.165 6.795 94.818 20.086 28.652 13.293 50.216 37.22 65.28 70.893 16.246-23.926 38.4-45.194 66.166-63.507 27.766-18.314 60.848-27.472 98.954-27.472 28.948 0 55.828 3.545 80.64 10.635 24.812 7.088 45.785 18.314 63.508 33.968 17.722 15.656 31.31 35.742 41.354 60.85 9.747 25.107 14.768 55.236 14.768 90.683v366.573h-150.35V865.28c0-18.314-.59-35.741-2.068-51.987-1.476-16.247-5.316-30.426-11.52-42.24-6.499-12.112-15.656-21.563-28.062-28.653-12.405-7.088-29.242-10.634-50.214-10.634-21.268 0-38.4 4.135-51.397 12.112-12.997 8.27-23.336 18.608-30.72 31.901-7.386 12.997-12.407 27.765-14.77 44.602-2.363 16.542-3.84 33.379-3.84 50.216v305.133H692.971v-307.2c0-16.247-.294-32.197-1.18-48.149-.591-15.95-3.84-30.424-9.157-44.011-5.317-13.293-14.178-24.223-26.585-32.197-12.406-7.976-30.425-12.112-54.646-12.112-7.088 0-16.542 1.478-28.062 4.726-11.52 3.25-23.04 9.157-33.968 18.02-10.93 8.86-20.383 21.563-28.063 38.103-7.68 16.543-11.52 38.4-11.52 65.28v317.834H349.44V627.792zm1004.309 1001.056V163.152H1390.08V128H1536v1536h-145.92v-35.152z"/>
+</svg>