From 486631430b2a242e6adf78f571e4aa62dc8501b2 Mon Sep 17 00:00:00 2001 From: Dion Dresschers Date: Wed, 17 Jun 2020 07:56:32 +0200 Subject: [PATCH] some unknown changes --- CHANGELOG.md | 4 + CONTRIBUTORS.md | 4 + css/fork-awesome.css | 12 +- fonts/forkawesome-webfont.svg | 245 ++++++++++++++++++++++++++++ src/icons/.fontcustom-manifest.json | 9 +- src/icons/icons.yml | 3 + src/icons/svg/funkwhale.svg | 3 - 7 files changed, 267 insertions(+), 13 deletions(-) delete mode 100644 src/icons/svg/funkwhale.svg diff --git a/CHANGELOG.md b/CHANGELOG.md index 3efa412d0..6be03589b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## Changelog of Iconze + +- 2020-05-06 + - Starting renaming from Fork Awesome to Iconze ## Changelog of Fork awesome - v1.1.6 - Added icons: file-epub, python, archlinux, pleroma, unsplash, hackster, spell-check, moon, sun, f-droid, and biometric diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index ef159efae..b7be310b8 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -1,3 +1,7 @@ +# Iconize + +Iconize is a Fork Awesome fork. + # ForkAwesome Community This is a list of people who made this project possible, whether they contributed to FontAwesome before or to ForkAwesome since. We are trying hard to recognize all types of contributions. So if you feel you have been left out and should be mentioned here, please accept our apology and [write us a message](https://github.com/ForkAwesome/Fork-Awesome/issues/new) about it. We'll fix this as soon as possible. diff --git a/css/fork-awesome.css b/css/fork-awesome.css index 41292c942..880fe22e6 100644 --- a/css/fork-awesome.css +++ b/css/fork-awesome.css @@ -69,9 +69,9 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI left: -1.85714286em; } .fa-border { - padding: .2em .25em .15em; + padding: 0.2em 0.25em 0.15em; border: solid 0.08em #eee; - border-radius: .1em; + border-radius: 0.1em; } .fa-pull-left { float: left; @@ -80,10 +80,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI float: right; } .fa.fa-pull-left { - margin-right: .3em; + margin-right: 0.3em; } .fa.fa-pull-right { - margin-left: .3em; + margin-left: 0.3em; } /* Deprecated as of 4.4.0 */ .pull-right { @@ -93,10 +93,10 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI float: left; } .fa.pull-left { - margin-right: .3em; + margin-right: 0.3em; } .fa.pull-right { - margin-left: .3em; + margin-left: 0.3em; } .fa-spin { -webkit-animation: fa-spin 2s infinite linear; diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg index 2066d6b8e..3e9d25eb0 100644 --- a/fonts/forkawesome-webfont.svg +++ b/fonts/forkawesome-webfont.svg @@ -1,12 +1,21 @@ Created by FontForge 20170924 at Sun Apr 12 18:44:30 2020 By Dion Dresschers,,, +======= +2019-11-21: Created with FontForge (http://fontforge.org) +--> + + +Created by FontForge 20190801 at Thu Nov 21 23:09:04 2019 + By Helmut K. C. Tessarek +>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale 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 @@ -22,7 +31,11 @@ The Fork Awesome font is licensed under the SIL OFL 1.1 (http://scripts.sil.org/ bbox="-0.653061 -410 2304.15 1538" underline-thickness="89.6" underline-position="-179.2" +<<<<<<< HEAD unicode-range="U+0020-F36A" +======= + unicode-range="U+0020-F338" +>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale /> +<<<<<<< HEAD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + >>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale }, "fonts": [ "forkawesome/forkawesome.ttf", @@ -1275,10 +1280,6 @@ "codepoint": 61721, "source": "svg/frown-o.svg" }, - "funkwhale": { - "codepoint": 62265, - "source": "svg/funkwhale.svg" - }, "futbol-o": { "codepoint": 61923, "source": "svg/futbol-o.svg" diff --git a/src/icons/icons.yml b/src/icons/icons.yml index 52fde3183..8a3147211 100644 --- a/src/icons/icons.yml +++ b/src/icons/icons.yml @@ -7443,6 +7443,7 @@ icons: - science categories: - Brand Icons +<<<<<<< HEAD - name: Funkwhale id: funkwhale @@ -7868,3 +7869,5 @@ icons: url: gnu.org categories: - Brand Icons +======= +>>>>>>> parent of c35800e5c... add icon: Funkwhale fa-funkwhale diff --git a/src/icons/svg/funkwhale.svg b/src/icons/svg/funkwhale.svg deleted file mode 100644 index 7de0bb454..000000000 --- a/src/icons/svg/funkwhale.svg +++ /dev/null @@ -1,3 +0,0 @@ - - -