Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/ForkAwesome/Fork-Awesome.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJulien Deswaef <judeswae@thoughtworks.com>2018-10-08 22:00:35 +0300
committerJulien Deswaef <judeswae@thoughtworks.com>2018-10-08 22:00:35 +0300
commite555fa2319c3f6a3d878af0f302a7e7e6fea26ba (patch)
treed1d069b19bd81052b070da391b744aec89cca518 /src
parent7ed34f8fe7be553d33025e9de0c7149d82cbe3ff (diff)
parent748822055bc2abd8f451555b2813acc270c0276d (diff)
Merge branch 'jerrykan-matrix_org'
Diffstat (limited to 'src')
-rw-r--r--src/doc/README.md-nobuild2
-rw-r--r--src/icons/.fontcustom-manifest.json8
-rw-r--r--src/icons/icons.yml12
-rw-r--r--src/icons/svg/matrix-org.svg3
4 files changed, 22 insertions, 3 deletions
diff --git a/src/doc/README.md-nobuild b/src/doc/README.md-nobuild
index e70d0ad9d..c48eb2c53 100644
--- 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)
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index 40570b37b..dbcc63518 100644
--- 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"
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index 90dd750d1..960d150d9 100644
--- 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
diff --git a/src/icons/svg/matrix-org.svg b/src/icons/svg/matrix-org.svg
new file mode 100644
index 000000000..a17891263
--- /dev/null
+++ 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>