Merge branch 'master' of github.com:ForkAwesome/Fork-Awesome

2024-12-25 21:11:32 +08:00 · 2019-11-25 17:46:54 +01:00 · 2019-11-25 17:46:54 +01:00 · 90981bb868
commit 90981bb868
parent 1cf25ff322 e3f630e09e
8 changed files with 22 additions and 11 deletions
--- a/fonts/forkawesome-webfont.eot
+++ b/fonts/forkawesome-webfont.eot
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@ -5,8 +5,8 @@
 -->
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1">
 <metadata>
-Created by FontForge 20190801 at Thu Nov 21 17:30:32 2019
- By Julien Deswaef
+Created by FontForge 20190801 at Thu Nov 21 23:09:04 2019
+ By Helmut K. C. Tessarek
 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>
 <defs>
@ -22,7 +22,7 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/
    bbox="-0.653061 -410 2304.01 1538"
    underline-thickness="89.6"
    underline-position="-179.2"
-    unicode-range="U+0020-F337"
+    unicode-range="U+0020-F338"
  />
    <missing-glyph />
    <glyph glyph-name="space" unicode=" " horiz-adv-x="200" 
@ -1460,9 +1460,10 @@ M729 1145l12 -12l-152 -152l-12 12c-49 49 -129 49 -178 0s-49 -130 0 -179l29 -29l1
 M1536 78c0 -114 -92 -206 -205 -206c-100 0 -183 71 -202 165c-116 -36 -249 -8 -341 84l-11 12l151 152l12 -12c49 -49 129 -49 178 0s49 129 0 178l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30c87 -87 118 -210 90 -322c100 -14 177 -99 177 -203z
 M1534 1202c0 -104 -78 -190 -178 -204c33 -115 4 -244 -87 -335l-12 -12l-151 152l12 12c49 49 49 129 0 178s-129 49 -178 0l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30c91 91 221 120 337 86c14 100 100 177 204 177c113 0 205 -92 205 -206z" />
    <glyph glyph-name="joplin" unicode="&#xf310;" 
-d="M288 1408h960c159 0 288 -129 288 -288v-960c0 -159 -129 -288 -288 -288h-960c-159 0 -288 129 -288 288v960c0 159 129 288 288 288zM737 1171v-148l43 -1c59 -2 70 -6 81 -30c4 -10 5 -13 5 -296c0 -323 0 -323 -16 -362c-16 -38 -48 -69 -87 -83
-c-13 -5 -21 -5 -43 -6c-33 -1 -53 2 -80 15c-30 14 -50 37 -62 69c-9 24 -10 34 -12 88c-2 51 -1 56 -7 70c-9 23 -25 45 -40 56c-24 18 -49 24 -87 22c-40 -2 -68 -13 -95 -41c-23 -23 -35 -44 -44 -75c-4 -15 -5 -23 -5 -54c0 -38 1 -46 11 -79c26 -82 92 -156 178 -199
-c46 -23 85 -35 155 -44v0c20 -3 119 -3 142 0c87 10 150 32 208 71c73 49 127 125 142 199c8 40 9 47 10 343l1 291l6 13c6 15 15 24 29 28c5 2 28 3 52 4l43 1v74l-1 73l-263 1h-264z" />
+d="M374 1408h788c206 0 374 -168 374 -374v-788c0 -206 -168 -374 -374 -374h-788c-206 0 -374 168 -374 374v788c0 206 168 374 374 374zM771 1203v0c-4 0 -7 -4 -7 -8v0v-132v0c0 -4 4 -8 8 -8v0h57c23 0 42 -18 44 -41v-627v0v-15c0 -1 -1 -1 -1 -2c0 -3 0 -5 -1 -8
+c0 -2 -1 -3 -1 -5c-1 -2 -1 -4 -2 -6c-4 -12 -10 -23 -18 -33l-1 -1c-3 -3 -5 -6 -8 -9c-2 -2 -6 -5 -9 -7c-23 -17 -55 -24 -90 -21c-45 4 -89 24 -125 57s-58 73 -63 114c-4 36 7 69 31 91v0c1 1 2 1 3 2c17 14 39 24 65 26h1h8h4h2h2h13c1 0 0 -1 1 -1h1
+c23 -2 47 -9 69 -20h1c7 -4 9 0 9 3v199c0 6 -4 11 -10 12c-118 26 -234 0 -316 -75c-72 -65 -107 -159 -96 -258c10 -88 56 -172 128 -238c70 -64 159 -104 251 -113c13 -1 26 -2 38 -2c88 0 170 30 230 85c57 52 91 123 96 201l1 510v0v136v0v2c1 24 20 44 44 44h58
+c4 0 8 4 8 8v132v0c0 4 -4 8 -8 8v0h-417z" />
    <glyph glyph-name="jpy" unicode="&#xf157;" horiz-adv-x="1026" 
 d="M603 0h-172c-18 0 -32 14 -32 32v330h-288c-18 0 -32 14 -32 32v103c0 18 14 32 32 32h288v85h-288c-18 0 -32 14 -32 32v104c0 17 14 32 32 32h214l-321 578c-5 10 -5 22 0 32c6 10 17 16 28 16h194c12 0 23 -7 29 -18l215 -425c24 -47 40 -87 56 -125
 c17 43 39 85 58 129l191 420c5 12 17 19 29 19h191c11 0 21 -6 27 -16c6 -9 6 -21 1 -31l-313 -579h215c18 0 32 -15 32 -32v-104c0 -18 -14 -32 -32 -32h-290v-85h290c18 0 32 -14 32 -32v-103c0 -18 -14 -32 -32 -32h-290v-330c0 -18 -15 -32 -32 -32z" />
@ -2073,6 +2074,12 @@ l512 512c12 12 28 19 45 19c35 0 64 -29 64 -64v-256h224c328 0 736 -58 875 -403c42
 d="M640 454v-70c0 -26 -16 -49 -39 -59c-8 -3 -17 -5 -25 -5c-17 0 -33 6 -45 19l-512 512c-25 25 -25 65 0 90l512 512c18 19 46 24 70 14c23 -10 39 -33 39 -59v-69l-397 -398c-25 -25 -25 -65 0 -90zM1792 416c0 -208 -157 -514 -164 -527c-5 -11 -16 -17 -28 -17
 c-3 0 -6 0 -9 1c-15 5 -24 19 -23 34c29 273 -5 453 -106 565c-85 95 -223 146 -438 163v-251c0 -26 -16 -49 -39 -59c-8 -3 -17 -5 -25 -5c-17 0 -33 6 -45 19l-512 512c-25 25 -25 65 0 90l512 512c18 19 46 24 70 14c23 -10 39 -33 39 -59v-262c276 -19 473 -92 599 -221
 c151 -155 169 -365 169 -509z" />
+    <glyph glyph-name="researchgate" unicode="&#xf338;" horiz-adv-x="1655" 
+d="M1056 -253c-129 14 -204 69 -326 240c-60 85 -148 223 -200 314l-32 56h-155v-207c0 -128 3 -219 8 -236c12 -46 35 -62 91 -71c105 -16 94 -11 94 -47v-33h-536v33c0 18 1 33 3 33c21 0 110 23 123 31c9 6 23 25 30 43c12 30 12 66 12 526c0 391 -2 500 -9 520
+c-13 36 -41 58 -88 67c-77 15 -71 11 -71 49v34h319c338 0 367 -2 450 -34c91 -35 165 -112 192 -198c20 -64 21 -160 1 -223c-19 -60 -74 -141 -123 -181c-40 -33 -125 -78 -147 -78c-10 0 -8 -7 13 -43c77 -132 241 -352 316 -425c44 -43 104 -79 150 -89l37 -8v-30
+c0 -25 -2 -31 -15 -36c-25 -9 -87 -12 -137 -7v0zM564 467c53 10 117 43 150 76c92 92 102 273 20 366c-61 70 -115 87 -276 87h-115v-528l16 -3c31 -6 169 -5 205 2v0zM1325 797c-105 22 -174 98 -192 212c-9 57 -9 251 0 309c15 95 71 170 148 199c75 28 174 25 240 -8
+c48 -24 113 -98 113 -128c0 -7 -94 -46 -98 -41c-1 2 -12 16 -24 34c-28 42 -67 61 -123 61c-57 0 -97 -26 -124 -81c-19 -38 -19 -42 -21 -174c-2 -109 0 -144 9 -174c21 -74 75 -111 154 -105c80 6 131 66 131 158v40h-137v96h254v-74c0 -140 -22 -210 -83 -265
+c-19 -17 -52 -38 -73 -46c-44 -17 -129 -23 -174 -13v0z" />
    <glyph glyph-name="retweet" unicode="&#xf079;" horiz-adv-x="1920" 
 d="M1280 32c0 -17 -15 -32 -32 -32h-960c-37 0 -32 39 -32 64v576h-192c-35 0 -64 29 -64 64c0 15 5 30 15 41l320 384c12 14 30 22 49 22s37 -8 49 -22l320 -384c10 -11 15 -26 15 -41c0 -35 -29 -64 -64 -64h-192v-384h576c9 0 19 -4 25 -11l160 -192c4 -6 7 -14 7 -21z
 M1920 448c0 -15 -5 -30 -15 -41l-320 -384c-12 -14 -30 -23 -49 -23s-37 9 -49 23l-320 384c-10 11 -15 26 -15 41c0 35 29 64 64 64h192v384h-576c-9 0 -19 4 -25 12l-160 192c-4 5 -7 13 -7 20c0 17 15 32 32 32h960c37 0 32 -39 32 -64v-576h192c35 0 64 -29 64 -64z" />
--- 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/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@ -1,7 +1,7 @@
 {
  "checksum": {
-    "previous": "637e5933dbf42c4a3740dfab534f7566b6f86a0893465dcec432d288c4e7207f",
-    "current": "637e5933dbf42c4a3740dfab534f7566b6f86a0893465dcec432d288c4e7207f"
+    "previous": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d",
+    "current": "d0e6cb1502b28a1bff1f0c82ba4613e03537e428eddae4124d7d09535a77771d"
  },
  "fonts": [
    "forkawesome/forkawesome.ttf",
@ -2179,6 +2179,10 @@
      "codepoint": 61730,
      "source": "svg/reply-all.svg"
    },
+    "researchgate": {
+      "codepoint": 62264,
+      "source": "svg/researchgate.svg"
+    },
    "retweet": {
      "codepoint": 61561,
      "source": "svg/retweet.svg"
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@ -7069,7 +7069,7 @@ icons:
    id:         joplin
    unicode:    f310
    created:    1.0
-    url:        joplin.cozic.net
+    url:        joplinapp.org
    categories:
      - Brand Icons

--- a/src/icons/svg/joplin.svg
+++ b/src/icons/svg/joplin.svg
@ -1,3 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1536" height="1792">
-    <path d="M288 128C129 128 0 257 0 416v960c0 159 129 288 288 288h960c159 0 288-129 288-288V416c0-159-129-288-288-288H288zm449.168 236.572l263.434.565 263.431.562.584 73.412.584 73.412-42.732 1.504c-23.708.835-47.002 2.774-52.322 4.36-14.497 4.318-23.722 12.902-29.563 27.51l-5.12 12.802-1.403 291.717c-1.425 295.661-1.626 302.586-9.936 343.043-15.2 74-69.604 150.014-142.197 198.685-58.287 39.08-121.487 60.47-208.155 70.45-22.999 2.648-122.228 2.636-141.976-.024l-.002.006c-69.785-9.377-108.469-20.202-154.848-43.332-85.682-42.73-151.778-116.991-177.537-199.469-10.247-32.81-11.407-40.853-11.375-78.754.026-31.257.76-39.15 5.024-54.043 8.94-31.228 20.912-51.733 43.56-74.62 27.312-27.6 55.812-40.022 95.524-41.633 37.997-1.542 63.274 5.024 87.23 22.66 15.263 11.235 30.828 33.238 39.537 55.884 5.52 14.355 5.949 18.31 7.549 69.569 1.675 53.648 3.05 63.99 11.674 87.785 11.777 32.499 31.771 55.017 61.46 69.22 26.835 12.838 47.272 16.785 80.56 15.56 21.646-.798 30.212-2.135 43.208-6.741 38.682-13.708 70.96-44.553 86.471-82.635 16.027-39.348 15.995-38.647 15.947-361.595-.042-283.26-.09-286.272-4.568-296.153-10.958-24.171-22.488-28.492-81.074-30.377l-42.969-1.38v-147.95z"/>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1536 1792" height="1792" width="1536">
+    <path d="M373.834 128C168.227 128 0 296.223 0 501.834v788.336C0 1495.778 168.227 1664 373.834 1664h788.336c205.608 0 373.83-168.222 373.83-373.83V501.834C1536 296.224 1367.778 128 1162.17 128zm397.222 205.431h417.424a7.132 7.132 0 0 1 7.132 7.133v132.552c0 4.461-3.619 8.073-8.077 8.073h-57.23c-24.168 0-43.768 19.338-44.284 43.374v2.377h-.017v136.191h-.053l-.466 509.375c-5.02 77.667-39.222 149.056-96.324 201.046-60.28 54.834-141.948 85.017-229.962 85.017-12.45 0-25.208-.61-37.907-1.785-92.157-8.682-181.494-48.601-251.662-112.438-71.99-65.517-117.147-150.03-127.164-238-11.226-98.763 23.42-192.783 95.045-257.937 81.99-74.637 198.185-101.768 316.613-75.704 5.574 1.227 9.55 6.282 9.55 11.997v199.52c-.199 2.625-1.481 6.599-8.183 2.896-.663-.365-1.194-.511-1.653-.531-21.987-10.587-45.159-17.57-68.559-19.916-.38-.04-.757-.124-1.138-.163-.537-.048-1.034-.033-1.556-.075-4.13-.354-8.183-.517-12.203-.58-.87-.011-1.771-.127-2.641-.127-.486 0-.951.05-1.437.057-1.464.011-2.886.115-4.33.163-2.76.102-5.497.211-8.182.448-.273.024-.547.07-.835.097-25.509 2.4-47.864 11.104-65.012 25.47-.954.802-1.974 1.53-2.9 2.36a1.34 1.34 0 0 1-.168.146c-23.96 21.8-34.881 53.872-30.726 90.316 4.62 40.737 26.94 81.156 62.841 113.823 35.908 32.67 80.335 52.977 125.113 57.186 35.118 3.36 66.547-3.919 89.899-20.461a97.255 97.255 0 0 0 9.365-7.501c2.925-2.661 5.569-5.5 8.086-8.416.3-.348.672-.673.975-1.024 8.253-9.864 14.222-21.067 17.996-33.148.639-2.034 1.051-4.148 1.564-6.227.381-1.563.81-3.106 1.112-4.693.555-2.784.923-5.632 1.253-8.49.086-.709.183-1.414.237-2.128.492-4.893.693-9.858.55-14.91h.013V521.623c-2.01-22.626-20.78-40.434-43.928-40.434h-57.23a8.071 8.071 0 0 1-8.077-8.073V340.564a7.132 7.132 0 0 1 7.136-7.133z"/>
 </svg>