diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg index 706d77e23..14fd52c6b 100644 --- a/fonts/forkawesome-webfont.svg +++ b/fonts/forkawesome-webfont.svg @@ -5,7 +5,11 @@ --> +<<<<<<< HEAD Created by FontForge 20170925 at Tue Feb 20 18:27:20 2018 +======= +Created by FontForge 20170925 at Tue Feb 20 20:25:21 2018 +>>>>>>> svg-template 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 @@ -19,7 +23,11 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ panose-1="2 0 5 3 0 0 0 0 0 0" ascent="1536" descent="-256" +<<<<<<< HEAD bbox="-0.470077 -264 2304.01 1536.25" +======= + bbox="-0.653061 -264 2304.01 1536.25" +>>>>>>> svg-template underline-thickness="89.6" underline-position="-179.2" unicode-range="U+0020-F2ED" @@ -375,10 +383,17 @@ c-69 0 -132 -28 -178 -80c-40 -45 -64 -105 -64 -160v-413c72 -44 155 -67 242 -67c1 c-25 6 -52 21 -52 43v680c0 18 14 38 38 38h877c30 0 30 -42 30 -55c0 -14 0 -55 -30 -55h-811v-483h1c56 59 153 121 210 145c71 30 151 46 231 46c79 0 156 -15 228 -46c70 -30 133 -72 187 -126s96 -116 126 -186c30 -73 46 -149 46 -229zM1355 1128 c19 -17 6 -35 -13 -57c-12 -12 -25 -26 -39 -26c-6 0 -11 2 -16 7c-72 62 -137 104 -207 133c-87 38 -180 56 -276 56c-85 0 -178 -17 -262 -49c-26 -10 -40 24 -45 37c-6 16 -9 29 -8 38c2 10 7 17 16 20c82 36 194 57 299 57c109 0 216 -22 316 -64 c92 -39 167 -87 235 -152z" /> +<<<<<<< HEAD +======= + +>>>>>>> svg-template @@ -584,10 +599,17 @@ c0 0 -147 99 -211 79c-42 -106 -16 -184 -8 -204c-49 -54 -79 -122 -79 -206c0 -294 c0 -64 1 -124 1 -143c0 -20 -14 -44 -53 -37c-305 102 -525 390 -525 729c0 424 344 768 768 768zM291 305c-2 -4 -8 -5 -13 -2c-6 3 -9 8 -7 12c2 3 7 4 13 2c6 -3 9 -8 7 -12zM322 271c-4 -4 -11 -2 -16 3c-5 6 -6 13 -2 16c4 4 11 2 16 -3c5 -6 6 -13 2 -16zM352 226 c-4 -3 -12 0 -17 7s-5 15 0 18c5 4 13 1 17 -6c5 -7 5 -15 0 -19zM394 184c-4 -5 -13 -4 -20 3c-7 6 -9 15 -4 19c4 5 13 4 20 -3c6 -6 8 -15 4 -19zM451 159c-2 -6 -11 -9 -19 -6c-9 2 -15 9 -13 15s11 9 19 7c9 -3 15 -10 13 -16zM514 154c0 -6 -7 -11 -16 -11 c-10 -1 -17 4 -17 11c0 6 7 11 16 11c9 1 17 -4 17 -11zM572 164c1 -6 -5 -12 -14 -14s-17 2 -18 8c-1 7 5 13 14 15c9 1 17 -3 18 -9z" /> +<<<<<<< HEAD +======= + +>>>>>>> svg-template @@ -938,10 +960,17 @@ d="M1188 214c0 -25 -10 -50 -28 -68l-136 -136c-18 -18 -43 -28 -68 -28s-50 10 -68 c18 18 43 28 68 28s50 -10 68 -28l294 -294l294 294c18 18 43 28 68 28s50 -10 68 -28l136 -136c18 -18 28 -43 28 -68s-10 -50 -28 -68l-294 -294l294 -294c18 -18 28 -43 28 -68z" /> +<<<<<<< HEAD +======= + +>>>>>>> svg-template - + @@ -1651,10 +1680,17 @@ c134 0 177 -171 235 -264c30 -47 64 -88 100 -129c29 -33 97 -119 145 -119h288c71 0 +<<<<<<< HEAD +======= + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template - + +<<<<<<< HEAD +======= + + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template diff --git a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg index 706d77e23..14fd52c6b 100644 --- a/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg +++ b/src/doc/assets/fork-awesome/fonts/forkawesome-webfont.svg @@ -5,7 +5,11 @@ --> +<<<<<<< HEAD Created by FontForge 20170925 at Tue Feb 20 18:27:20 2018 +======= +Created by FontForge 20170925 at Tue Feb 20 20:25:21 2018 +>>>>>>> svg-template 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 @@ -19,7 +23,11 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ panose-1="2 0 5 3 0 0 0 0 0 0" ascent="1536" descent="-256" +<<<<<<< HEAD bbox="-0.470077 -264 2304.01 1536.25" +======= + bbox="-0.653061 -264 2304.01 1536.25" +>>>>>>> svg-template underline-thickness="89.6" underline-position="-179.2" unicode-range="U+0020-F2ED" @@ -375,10 +383,17 @@ c-69 0 -132 -28 -178 -80c-40 -45 -64 -105 -64 -160v-413c72 -44 155 -67 242 -67c1 c-25 6 -52 21 -52 43v680c0 18 14 38 38 38h877c30 0 30 -42 30 -55c0 -14 0 -55 -30 -55h-811v-483h1c56 59 153 121 210 145c71 30 151 46 231 46c79 0 156 -15 228 -46c70 -30 133 -72 187 -126s96 -116 126 -186c30 -73 46 -149 46 -229zM1355 1128 c19 -17 6 -35 -13 -57c-12 -12 -25 -26 -39 -26c-6 0 -11 2 -16 7c-72 62 -137 104 -207 133c-87 38 -180 56 -276 56c-85 0 -178 -17 -262 -49c-26 -10 -40 24 -45 37c-6 16 -9 29 -8 38c2 10 7 17 16 20c82 36 194 57 299 57c109 0 216 -22 316 -64 c92 -39 167 -87 235 -152z" /> +<<<<<<< HEAD +======= + +>>>>>>> svg-template @@ -584,10 +599,17 @@ c0 0 -147 99 -211 79c-42 -106 -16 -184 -8 -204c-49 -54 -79 -122 -79 -206c0 -294 c0 -64 1 -124 1 -143c0 -20 -14 -44 -53 -37c-305 102 -525 390 -525 729c0 424 344 768 768 768zM291 305c-2 -4 -8 -5 -13 -2c-6 3 -9 8 -7 12c2 3 7 4 13 2c6 -3 9 -8 7 -12zM322 271c-4 -4 -11 -2 -16 3c-5 6 -6 13 -2 16c4 4 11 2 16 -3c5 -6 6 -13 2 -16zM352 226 c-4 -3 -12 0 -17 7s-5 15 0 18c5 4 13 1 17 -6c5 -7 5 -15 0 -19zM394 184c-4 -5 -13 -4 -20 3c-7 6 -9 15 -4 19c4 5 13 4 20 -3c6 -6 8 -15 4 -19zM451 159c-2 -6 -11 -9 -19 -6c-9 2 -15 9 -13 15s11 9 19 7c9 -3 15 -10 13 -16zM514 154c0 -6 -7 -11 -16 -11 c-10 -1 -17 4 -17 11c0 6 7 11 16 11c9 1 17 -4 17 -11zM572 164c1 -6 -5 -12 -14 -14s-17 2 -18 8c-1 7 5 13 14 15c9 1 17 -3 18 -9z" /> +<<<<<<< HEAD +======= + +>>>>>>> svg-template @@ -938,10 +960,17 @@ d="M1188 214c0 -25 -10 -50 -28 -68l-136 -136c-18 -18 -43 -28 -68 -28s-50 10 -68 c18 18 43 28 68 28s50 -10 68 -28l294 -294l294 294c18 18 43 28 68 28s50 -10 68 -28l136 -136c18 -18 28 -43 28 -68s-10 -50 -28 -68l-294 -294l294 -294c18 -18 28 -43 28 -68z" /> +<<<<<<< HEAD +======= + +>>>>>>> svg-template - + @@ -1651,10 +1680,17 @@ c134 0 177 -171 235 -264c30 -47 64 -88 100 -129c29 -33 97 -119 145 -119h288c71 0 +<<<<<<< HEAD +======= + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template - + +<<<<<<< HEAD +======= + + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template +<<<<<<< HEAD +======= + +>>>>>>> svg-template diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json index 488961467..8b738114b 100644 --- a/src/icons/.fontcustom-manifest.json +++ b/src/icons/.fontcustom-manifest.json @@ -2786,4 +2786,4 @@ "forkawesome/forkawesome.css", "forkawesome/forkawesome-preview.html" ] -} \ No newline at end of file +} diff --git a/src/icons/icon-template-inkscape.svg b/src/icons/icon-template-inkscape.svg new file mode 100644 index 000000000..a33319957 --- /dev/null +++ b/src/icons/icon-template-inkscape.svg @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + diff --git a/src/icons/svg/artstation.svg b/src/icons/svg/artstation.svg index a9346d13c..aa845095d 100644 --- a/src/icons/svg/artstation.svg +++ b/src/icons/svg/artstation.svg @@ -1,10 +1,10 @@ - + - - + + diff --git a/src/icons/svg/diaspora.svg b/src/icons/svg/diaspora.svg index 107ae5782..3111974a5 100644 --- a/src/icons/svg/diaspora.svg +++ b/src/icons/svg/diaspora.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/fork-awesome.svg b/src/icons/svg/fork-awesome.svg index 4552cf149..a3c7d8f11 100644 --- a/src/icons/svg/fork-awesome.svg +++ b/src/icons/svg/fork-awesome.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/friendica.svg b/src/icons/svg/friendica.svg index eed220b78..dc9b5d3bd 100644 --- a/src/icons/svg/friendica.svg +++ b/src/icons/svg/friendica.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/gnu-social.svg b/src/icons/svg/gnu-social.svg index 45ec27915..7a1bc8c05 100644 --- a/src/icons/svg/gnu-social.svg +++ b/src/icons/svg/gnu-social.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/hubzilla.svg b/src/icons/svg/hubzilla.svg index 6da714e73..eb046440b 100644 --- a/src/icons/svg/hubzilla.svg +++ b/src/icons/svg/hubzilla.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/liberapay-square.svg b/src/icons/svg/liberapay-square.svg index f1eb4d38f..0430d2c5b 100644 --- a/src/icons/svg/liberapay-square.svg +++ b/src/icons/svg/liberapay-square.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/liberapay.svg b/src/icons/svg/liberapay.svg index e329872ca..2d6ca8540 100644 --- a/src/icons/svg/liberapay.svg +++ b/src/icons/svg/liberapay.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/mastodon-alt.svg b/src/icons/svg/mastodon-alt.svg index a66b446f3..c1577e08f 100644 --- a/src/icons/svg/mastodon-alt.svg +++ b/src/icons/svg/mastodon-alt.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/mastodon.svg b/src/icons/svg/mastodon.svg index 3d06a1ae2..57fa478e8 100644 --- a/src/icons/svg/mastodon.svg +++ b/src/icons/svg/mastodon.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/scuttlebutt.svg b/src/icons/svg/scuttlebutt.svg index 475f10e9e..733f5d46b 100644 --- a/src/icons/svg/scuttlebutt.svg +++ b/src/icons/svg/scuttlebutt.svg @@ -1,3 +1,3 @@ - - + + diff --git a/src/icons/svg/social-home.svg b/src/icons/svg/social-home.svg index 9ea312f56..f3c4d8f5b 100644 --- a/src/icons/svg/social-home.svg +++ b/src/icons/svg/social-home.svg @@ -1,3 +1,3 @@ - - + +