diff --git a/.all-contributorsrc b/.all-contributorsrc
index 32e6b7476..7be4279a2 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1164,6 +1164,24 @@
"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"
+ ]
}
],
"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/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 308b73d3d..58fdb63f0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -11,171 +11,176 @@ 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 0583efdb2..2f147fe52 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ Within the container, build the font:
$ make -C src/icons
-[all-contrib]: https://img.shields.io/badge/all_contributors-126-orange.svg "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 "CDNJS badge"
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/fonts/forkawesome-webfont.eot b/fonts/forkawesome-webfont.eot
index 3a0a7e189..c2c24b416 100644
Binary files a/fonts/forkawesome-webfont.eot and b/fonts/forkawesome-webfont.eot differ
diff --git a/fonts/forkawesome-webfont.svg b/fonts/forkawesome-webfont.svg
index a4d966595..bd45b3049 100644
--- a/fonts/forkawesome-webfont.svg
+++ b/fonts/forkawesome-webfont.svg
@@ -1,12 +1,12 @@