diff --git a/.all-contributorsrc b/.all-contributorsrc
index 32e6b7476..7fbd907eb 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1164,6 +1164,69 @@
"contributions": [
"design"
]
+ },
+ {
+ "login": "panigrc",
+ "name": "Nikos Papagiannopoulos",
+ "avatar_url": "https://avatars.githubusercontent.com/u/645895?v=4",
+ "profile": "https://nikospapagiannopoulos.com",
+ "contributions": [
+ "review"
+ ]
+ },
+ {
+ "login": "thomasbnt",
+ "name": "Thomasbnt.dev",
+ "avatar_url": "https://avatars.githubusercontent.com/u/14293805?v=4",
+ "profile": "https://thomasbnt.dev",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "mrdrogdrog",
+ "name": "Tilman Vatteroth",
+ "avatar_url": "https://avatars.githubusercontent.com/u/6124140?v=4",
+ "profile": "https://github.com/mrdrogdrog",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "seanking2919",
+ "name": "Sean King",
+ "avatar_url": "https://avatars.githubusercontent.com/u/31253278?v=4",
+ "profile": "https://github.com/seanking2919",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "SlrG",
+ "name": "Michael Wehr",
+ "avatar_url": "https://avatars.githubusercontent.com/u/978967?v=4",
+ "profile": "https://github.com/SlrG",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "aguragorn",
+ "name": "Edward Remo",
+ "avatar_url": "https://avatars.githubusercontent.com/u/3759189?v=4",
+ "profile": "https://github.com/aguragorn",
+ "contributions": [
+ "design"
+ ]
+ },
+ {
+ "login": "n194",
+ "name": "n",
+ "avatar_url": "https://avatars.githubusercontent.com/u/67550725?v=4",
+ "profile": "https://codeberg.org",
+ "contributions": [
+ "design"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3efa412d0..827d1e0b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,13 @@
# Changelog
## Changelog of Fork awesome
+- v1.2
+ - Added icons: Wire, Tor project, volume mute, ringing bell & outlined ringing bell, HAL, Jupytr, Julia, research gate, Open Collective, ClassicPress, ORCID, funkwhale and 38 more. π
+ - Updated Joplin icon.
+ - Added fa-content() function to fix issue with css displaying glyphs when converted to unicode values by sass.
+ - Updated npm packages for security reasons, and added a new option to fix odd behavior that came with svgo update (the icons chaging shape).
+ - Added docker container and instructions in readme.
+ - Build process now 'works without errors' π
- v1.1.6
- Added icons: file-epub, python, archlinux, pleroma, unsplash, hackster, spell-check, moon, sun, f-droid, and biometric
- Some documentation correction and augmentation, mostly in the README
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c184038a..ea41aa538 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -28,6 +28,13 @@ Adding a new icon is a couple steps process that will require your attention and
5. Once you are satisfied with your design and the preview of it. Add the icon name, unicode point and icon information at the bottom of the `src/icons/icons.yml` file. Look at other entries to see how it's done and to give it a proper classification.
6. Once all this is done, commit your changes and make a pull request.
+Note : Please be considerate about maintainers' time and please
+[link your pull requests] to the icon request issue if it exists. You
+could use it within your commit message as well. This saves the
+maintainers extra effort in having to keep track of and close completed
+issues.
+
+[link your pull requests]: https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue
## Suggesting icon keyword addition/removal
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 308b73d3d..fb24c7de6 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -11,171 +11,181 @@ Thanks goes to these wonderful people ([emoji key](https://github.com/kentcdodds
-
+
+
This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome!
diff --git a/README.md b/README.md
index 441f6bca0..2f147fe52 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,15 @@
# Fork Awesome
### A fork of the iconic font and CSS toolkit
-[![npm-badge]][npm-link] [![all-contrib]](CONTRIBUTORS.md) [![jsdeliver-badge]][jsdeliver-link] [![cdnjs-badge]][cdnjs-link] [![build-status-badge]][build-status-link]
+[![npm-badge]][npm-link] [![all-contrib]](CONTRIBUTORS.md) [![jsdeliver-badge]][jsdeliver-link] [![cdnjs-badge]][cdnjs-link] [![build-status-badge]][build-status-link] [![matrix-badge]][matrix-link]
-Fork Awesome is a full suite of 796 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 suite of 796 pictographic and brand icons for easy, scalable vector graphics on websites and beyond.**
-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.
+This project, as the name suggests, began as a fork of [Font Awesome](https://fontawesome.com). Font Awesome was originally created by [Dave Gandy](https://twitter.com/davegandy) and ran as a community project. However, as Font Awesome developed, pull requests from the community stopped being accepted (October 2016) and as of version 5.0 [the build system became private](https://github.com/FortAwesome/Font-Awesome/issues/12199#issuecomment-362919956) (February 2018).
-A tremendous gratitude is given to the whole team behind [Font Awesome](https://fontawesome.com), and you are encouraged to support them and buy Font Awesome Pro for your project.
+With gratitude to Dave Gandy and the Font Awesome team, [Julien](https://github.com/xuv) [Deswaef](https://merveilles.town/@xuv) forked Font Awesome 4.7 into [Fork Awesome 1.0](https://github.com/ForkAwesome/Fork-Awesome/releases/tag/1.0.0) in February 2018, to continue building the amazing resource in a fully free, libre and open-source fashion, with and for the wider community. After a period of extended inactivity (i.e. no release since February 2019), several Fork Awesome users [got](https://github.com/ForkAwesome/Fork-Awesome/issues/292) [together](https://github.com/ForkAwesome/Fork-Awesome/issues/235) to try and revive the project π±
-Though If you believe in distributed open source design and wish to be part of this new adventure, please start submitting patches and suggestions of improvement.
-
-Also, if you care about owning the build process of your icon font, this project will give you that. The whole pipeline is shared and free to use for any purpose. You could be spinning your own icon font with your clever name by just forking this project and changing a few settings.
+We are now catching up with backlogged issues and pull requests, updating technology and documentation β even reevaluating the project aims, as icon fonts gradually [become](https://www.irigoyen.dev/blog/2021/02/17/stop-using-icon-fonts/) [deprecated](https://cloudfour.com/thinks/seriously-dont-use-icon-fonts/). Come say hi in the [#forkawesome:matrix.org](https://matrix.to/#/#forkawesome:matrix.org) matrix room π
## How to use
There is a full page in our documentation website that explains [how to use Fork Awesome in your web project](https://forkaweso.me/Fork-Awesome/get-started/). It ranges from just pointing to a CSS file on a CDN, hosting it on your own server or even adapting the LESS and SCSS files to your own liking.
@@ -113,12 +111,14 @@ Within the container, build the font:
$ make -C src/icons
-[all-contrib]: https://img.shields.io/badge/all_contributors-125-orange.svg?style=flat-square "All Contributors badge"
+[all-contrib]: https://img.shields.io/badge/all_contributors-128-orange.svg "All Contributors badge"
[build-status-badge]: https://travis-ci.org/ForkAwesome/Fork-Awesome.svg?branch=master "Build status badge"
[build-status-link]: https://travis-ci.org/ForkAwesome/Fork-Awesome
-[cdnjs-badge]: https://img.shields.io/cdnjs/v/fork-awesome.svg?style=flat-square "CDNJS badge"
+[cdnjs-badge]: https://img.shields.io/cdnjs/v/fork-awesome.svg "CDNJS badge"
[cdnjs-link]: https://cdnjs.com/libraries/fork-awesome
-[jsdeliver-badge]: https://data.jsdelivr.com/v1/package/npm/fork-awesome/badge "JSDeliver badge"
+[jsdeliver-badge]: https://img.shields.io/jsdelivr/npm/hm/fork-awesome "JSDeliver badge"
[jsdeliver-link]: https://www.jsdelivr.com/package/npm/fork-awesome
-[npm-badge]: https://img.shields.io/npm/v/fork-awesome.svg?style=flat&colorB=CB3837 "NPM badge"
-[npm-link]: ttps://www.npmjs.com/package/fork-awesome
+[npm-badge]: https://img.shields.io/npm/v/fork-awesome.svg?colorB=CB3837 "NPM badge"
+[npm-link]: https://www.npmjs.com/package/fork-awesome
+[matrix-badge]: https://img.shields.io/matrix/forkawesome:matrix.org?label=%23forkawesome%3Amatrix.org "chat (matrix) badge"
+[matrix-link]: https://matrix.to/#/#forkawesome:matrix.org
diff --git a/composer.json b/composer.json
index a04c73866..2a4153e12 100644
--- a/composer.json
+++ b/composer.json
@@ -2,28 +2,19 @@
"name": "forkawesome/fork-awesome",
"description": "A fork of the iconic font and CSS framework",
"keywords": ["font", "awesome", "fontawesome", "forkawesome", "icon", "bootstrap"],
- "homepage": "http://forkawesome.github.io/Fork-Awesome/",
+ "homepage": "https://forkaweso.me",
"type": "component",
"authors": [
{
"name": "Fork Awesome Community",
- "homepage": "https://forkawesome.github.io"
+ "homepage": "https://forkaweso.me"
}
],
"support": {
"issues": "https://github.com/ForkAwesome/Fork-Awesome/issues"
},
- "extra": {
- "branch-alias": {
- "dev-master": "1.0.x-dev"
- }
- },
"license": [
"OFL-1.1",
"MIT"
- ],
- "require-dev": {
- "jekyll": "1.0.2",
- "lessc": "1.4.2"
- }
+ ]
}
diff --git a/package-lock.json b/package-lock.json
index c26e93947..04bb9b8b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
{
"name": "fork-awesome",
- "version": "1.1.7",
+ "version": "1.2.0",
"lockfileVersion": 1,
"requires": true,
"dependencies": {
@@ -25,15 +25,6 @@
"integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
"dev": true
},
- "@wikimedia/less-plugin-clean-css": {
- "version": "1.5.2",
- "resolved": "https://registry.npmjs.org/@wikimedia/less-plugin-clean-css/-/less-plugin-clean-css-1.5.2.tgz",
- "integrity": "sha512-dvYuF01G+vitty/OLvjXfIC6CRQQbEJN9YB6H8qTRowZO03uetIgHoWaPLGBCgvz1QoGYlCvINVv9VsK4h9IVw==",
- "dev": true,
- "requires": {
- "clean-css": "^4.2.1"
- }
- },
"ajv": {
"version": "6.12.2",
"resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.2.tgz",
@@ -874,6 +865,14 @@
"tslib": "^1.10.0"
}
},
+ "less-plugin-clean-css": {
+ "version": "github:less/less-plugin-clean-css#823c04eaa3005de4e8c7f4653204d7467b12d2e6",
+ "from": "github:less/less-plugin-clean-css#master",
+ "dev": true,
+ "requires": {
+ "clean-css": "^4.2.1"
+ }
+ },
"locate-path": {
"version": "5.0.0",
"resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
diff --git a/package.json b/package.json
index 933df7318..0db06ca48 100644
--- a/package.json
+++ b/package.json
@@ -23,17 +23,17 @@
"license": "(OFL-1.1 AND MIT)",
"dependencies": {},
"devDependencies": {
- "@wikimedia/less-plugin-clean-css": "^1.5.2",
"all-contributors-cli": "^6.16.0",
"less": "^3.11.3",
+ "less-plugin-clean-css": "less/less-plugin-clean-css#master",
"svgo": "^1.3.2"
},
"engines": {
"node": ">=0.10.3"
},
"scripts": {
- "build": "bundle exec jekyll build",
- "dev": "bundle exec jekyll serve -w",
+ "build": "RUBYOPT='-W0' bundle exec jekyll build",
+ "dev": "RUBYOPT='-W0' bundle exec jekyll serve -w",
"contributors:add": "all-contributors add",
"contributors:generate": "all-contributors generate"
},
diff --git a/src/icons/.fontcustom-manifest.json b/src/icons/.fontcustom-manifest.json
index c56dda05d..8b5a42c5b 100644
--- a/src/icons/.fontcustom-manifest.json
+++ b/src/icons/.fontcustom-manifest.json
@@ -1,7 +1,7 @@
{
"checksum": {
- "previous": "91690cff278d3b011db2fe3632514236c484310a41a9c344786859f9b2df9b3e",
- "current": "91690cff278d3b011db2fe3632514236c484310a41a9c344786859f9b2df9b3e"
+ "previous": "74bef76ed80b2ec8eafda938cd299dabecaa37ff350efc6db09585b834fea202",
+ "current": "74bef76ed80b2ec8eafda938cd299dabecaa37ff350efc6db09585b834fea202"
},
"fonts": [
"forkawesome/forkawesome.ttf",
@@ -3230,4 +3230,4 @@
"forkawesome/forkawesome.css",
"forkawesome/forkawesome-preview.html"
]
-}
\ No newline at end of file
+}
diff --git a/src/icons/icons.yml b/src/icons/icons.yml
index b1f2ad16c..ba042ddef 100644
--- a/src/icons/icons.yml
+++ b/src/icons/icons.yml
@@ -7789,7 +7789,67 @@ icons:
categories:
- Brand Icons
-
+ - name: HedgeDoc
+ id: hedgedoc
+ unicode: f360
+ created: 1.2
+ url: hedgedoc.org
+ categories:
+ - Brand Icons
+
+ - name: Fediverse
+ id: fediverse
+ unicode: f361
+ created: 1.2
+ filter:
+ - social-network
+ - federation
+ categories:
+ - Web Application Icons
+
+ - name: ProFTPD
+ id: proftpd
+ unicode: f362
+ created: 1.2
+ url: proftpd.org
+ categories:
+ - Brand Icons
+
+ - name: Open Source Initiative
+ id: osi
+ unicode: f363
+ created: 1.2
+ url: opensource.org
+ filter:
+ - open source
+ categories:
+ - Brand Icons
+
+ - name: EyeEm
+ id: eyeem
+ unicode: f364
+ created: 1.2
+ url: eyeem.com
+ categories:
+ - Brand Icons
+
+ - name: EyeEm Outlined
+ id: eyeem-o
+ unicode: f365
+ created: 1.2
+ url: eyeem.com
+ categories:
+ - Brand Icons
+
+ - name: Codeberg
+ id: codeberg
+ unicode: f366
+ created: 1.2
+ url: codeberg.org
+ categories:
+ - Brand Icons
+
+
diff --git a/src/icons/svg/buymeacoffee.svg b/src/icons/svg/buymeacoffee.svg
index 097bb9525..f42c20fa4 100644
--- a/src/icons/svg/buymeacoffee.svg
+++ b/src/icons/svg/buymeacoffee.svg
@@ -1,3 +1 @@
-
+
diff --git a/src/icons/svg/codeberg.svg b/src/icons/svg/codeberg.svg
new file mode 100644
index 000000000..d5fdd1a10
--- /dev/null
+++ b/src/icons/svg/codeberg.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/icons/svg/eyeem-o.svg b/src/icons/svg/eyeem-o.svg
new file mode 100644
index 000000000..581432146
--- /dev/null
+++ b/src/icons/svg/eyeem-o.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/icons/svg/eyeem.svg b/src/icons/svg/eyeem.svg
new file mode 100644
index 000000000..28c08fc0f
--- /dev/null
+++ b/src/icons/svg/eyeem.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/icons/svg/fediverse.svg b/src/icons/svg/fediverse.svg
new file mode 100644
index 000000000..283442dc6
--- /dev/null
+++ b/src/icons/svg/fediverse.svg
@@ -0,0 +1,3 @@
+
diff --git a/src/icons/svg/hedgedoc.svg b/src/icons/svg/hedgedoc.svg
new file mode 100644
index 000000000..4457643f0
--- /dev/null
+++ b/src/icons/svg/hedgedoc.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/src/icons/svg/osi.svg b/src/icons/svg/osi.svg
new file mode 100644
index 000000000..038b00d10
--- /dev/null
+++ b/src/icons/svg/osi.svg
@@ -0,0 +1,9 @@
+
diff --git a/src/icons/svg/proftpd.svg b/src/icons/svg/proftpd.svg
new file mode 100644
index 000000000..761efbe5f
--- /dev/null
+++ b/src/icons/svg/proftpd.svg
@@ -0,0 +1,3 @@
+