diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 000000000..2739700c5 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,24 @@ +# Changelog + +## Changelog of Font Awesome +- [v4.7.0 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/10012) +- [v4.6.3 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9189) +- [v4.6.2 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/9117) +- [v4.6.1 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/8962) +- [v4.6.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.6.0+is%3Aclosed) +- [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed) +- [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed) +- [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed) +- [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed) +- [v4.1.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=6&page=1&state=closed) +- [v4.0.3 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=9&page=1&state=closed) +- [v4.0.2 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=8&page=1&state=closed) +- [v4.0.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=7&page=1&state=closed) +- [v4.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=2&page=1&state=closed) +- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed) +- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed) +- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed) +- v3.1.0 - Added 54 icons, icon stacking styles, flipping and rotating icons, removed Sass support +- v3.0.2 - much improved rendering and alignment in IE7 +- v3.0.1 - much improved rendering in webkit, various bug fixes +- v3.0.0 - all icons redesigned from scratch, optimized for Bootstrap's 14px default diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 094cef8e6..6275c91de 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,9 +1,7 @@ -# Contributing to Font Awesome +# Contributing to Fork Awesome Looking to contribute something to Font Awesome? **Here's how you can help.** - - ## Requesting new icons New icons mostly start as requests by the [Font Awesome community on GitHub](../../issues). Want to request a new icon? Here are some things to keep in mind: @@ -63,9 +61,6 @@ As of v3.2.0, Font Awesome's CSS, LESS, SCSS, and documentation are all powered ## Pull requests -- At the moment we are not accepting pull requests containing icons -- Submit all pull requests against the appropriate `*-wip` branch for easier merging -- If your PR only affect the docs, feel free to push against the `master` branch - Any changes to the docs must be made to the Liquid templates in the `src` directory - Any changes to the styles must be made to the .less and .scss files in the `src` directory - If modifying the .less and .scss files, always recompile and commit the compiled files diff --git a/HELP-US-OUT.txt b/HELP-US-OUT.txt deleted file mode 100644 index 83d083dd7..000000000 --- a/HELP-US-OUT.txt +++ /dev/null @@ -1,7 +0,0 @@ -I hope you love Font Awesome. If you've found it useful, please do me a favor and check out my latest project, -Fort Awesome (https://fortawesome.com). It makes it easy to put the perfect icons on your website. Choose from our awesome, -comprehensive icon sets or copy and paste your own. - -Please. Check it out. - --Dave Gandy diff --git a/README.md b/README.md index e6e683a74..c82db190f 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Fork Awesome -### A fork of the iconic font and CSS framework +### A fork of the iconic font and CSS toolkit Fork Awesome is a full suite of 677 pictographic icons for easy scalable vector graphics on websites, originally created by [Dave Gandy](https://twitter.com/davegandy) and now maintained by a community. @@ -10,11 +10,11 @@ A tremendous gratitude is given to the whole team behind [Font Awesome](https:// This fork is still in its very early stage of development. Though If you wish to be part of the adventure, please start submitting patches. ## License -- The Fork Awesome font is licensed under the SIL OFL 1.1: +- The Font Awesome font is licensed under the SIL OFL 1.1: - http://scripts.sil.org/OFL -- Fork Awesome CSS, LESS, and Sass files are licensed under the MIT License: +- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License: - https://opensource.org/licenses/mit-license.html -- The Fork Awesome documentation is licensed under the CC BY 3.0 License: +- The Font Awesome documentation is licensed under the CC BY 3.0 License: - https://creativecommons.org/licenses/by/3.0/ ## Changelog @@ -42,12 +42,12 @@ This fork is still in its very early stage of development. Though If you wish to ## Contributing -Please read through our [contributing guidelines](https://github.com/FortAwesome/Font-Awesome/blob/master/CONTRIBUTING.md). +Please read through our [contributing guidelines](https://github.com/ForkAwesome/Fork-Awesome/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. ## Versioning -Font Awesome will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered +Fork Awesome will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format: `..` @@ -57,10 +57,11 @@ And constructed with the following guidelines: * Breaking backward compatibility bumps the major (and resets the minor and patch) * New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch) * Bug fixes, changes to brand logos, and misc changes bumps the patch +* The fork is based on FontAwesome 4.7 and renamed. So it starts at version 0.4.7 For more information on SemVer, please visit http://semver.org. -## Author +## Original authors ot Font Awesome: - Email: dave@fontawesome.io - Twitter: http://twitter.com/davegandy - GitHub: https://github.com/davegandy diff --git a/_config.yml b/_config.yml index 18129a1fc..09294f1c8 100644 --- a/_config.yml +++ b/_config.yml @@ -1,6 +1,6 @@ safe: false port: 7998 -baseurl: /Font-Awesome/ # Where GitHub serves the project up from +baseurl: /Fork-Awesome/ # Where GitHub serves the project up from url: http://localhost:7998 source: src @@ -18,6 +18,31 @@ icon_meta: src/icons.yml icon_layout: icon.html # Relative to _layouts directory icon_destination: icon # Relative to destination +forkawesome: + name: Fork Awesome + version: 0.4.7 + minor_version: 0.4 + major_version: 0 + doc_blob: v0.4.7 + url: http://forkawesome.github.com/ + legacy_url: http://forkawesome.github.com/Fork-Awesome/ + tagline: A fork of the iconic font and CSS toolkit + css_prefix: fa + github: + url: https://github.com/ForkAwesome/Fork-Awesome + project: Fork-Awesome + org: ForkAwesome + license: + font: + version: SIL OFL 1.1 + url: http://scripts.sil.org/OFL + code: + version: MIT License + url: http://opensource.org/licenses/mit-license.html + documentation: + version: CC BY 3.0 + url: http://creativecommons.org/licenses/by/3.0/ + fontawesome: version: 4.7.0 minor_version: 4.7 diff --git a/component.json b/component.json index 0b0fb0a4d..c21f0af90 100644 --- a/component.json +++ b/component.json @@ -1,8 +1,8 @@ { - "name": "font-awesome", - "repo": "FortAwesome/Font-Awesome", - "description": "Font Awesome", - "version": "4.7.0", + "name": "fork-awesome", + "repo": "ForkAwesome/Fork-Awesome", + "description": "Fork Awesome", + "version": "0.4.7", "keywords": [], "dependencies": {}, "development": {}, diff --git a/composer.json b/composer.json index aceb43c1b..4f82a2aa8 100644 --- a/composer.json +++ b/composer.json @@ -1,8 +1,8 @@ { - "name": "fortawesome/font-awesome", - "description": "The iconic font and CSS framework", + "name": "forkawesome/fork-awesome", + "description": "A fork of the iconic font and CSS framework", "keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"], - "homepage": "http://fontawesome.io/", + "homepage": "http://forkawesome.github.io/", "type": "component", "authors": [ { diff --git a/src/CNAME b/src/CNAME deleted file mode 100644 index f13145254..000000000 --- a/src/CNAME +++ /dev/null @@ -1 +0,0 @@ -fontawesome.io \ No newline at end of file diff --git a/src/README.md-nobuild b/src/README.md-nobuild index d74d417d3..702efa74d 100644 --- a/src/README.md-nobuild +++ b/src/README.md-nobuild @@ -1,14 +1,15 @@ --- --- -# [Font Awesome v{{ site.fontawesome.version }}]({{ site.fontawesome.url }}) [![Changelog #226](https://img.shields.io/badge/changelog-%23226-9E978E.svg)](https://changelog.com/podcast/226) -### The iconic font and CSS framework +# {{ site.forkawesome.name }} +### {{ site.forkawesome.tagline }} -Font Awesome is a full suite of {{ icons | size }} pictographic icons for easy scalable vector graphics on websites, -created and maintained by [{{ site.fontawesome.author.name }}](https://twitter.com/{{ site.fontawesome.author.twitter }}). -Stay up to date with the latest release and announcements on Twitter: -[@{{ site.fontawesome.twitter }}](https://twitter.com/{{ site.fontawesome.twitter }}). +{{ site.forkawesome.name }} is a full suite of 677 pictographic icons for easy scalable vector graphics on websites, originally created by [Dave Gandy](https://twitter.com/davegandy) and now maintained by a community. -Get started at {{ site.fontawesome.url }}! +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 is taking with the version 5.0 of their project, we are forking Font Awesome (4.7), in order to build on this incredible tool Dave Gandy has given us, while at the same time allowing this project to be run by a distributed community of contributors. + +A tremendous gratitude is given to the whole team behind [Font Awesome](https://fontawesome.io), and you are encouraged to support them and buy Font Awesome Pro for your project. + +This fork is still in its very early stage of development. Though If you wish to be part of the adventure, please start submitting patches. ## License - The Font Awesome font is licensed under the SIL OFL 1.1: @@ -17,9 +18,6 @@ Get started at {{ site.fontawesome.url }}! - https://opensource.org/licenses/mit-license.html - The Font Awesome documentation is licensed under the CC BY 3.0 License: - https://creativecommons.org/licenses/by/3.0/ -- Attribution is no longer required as of Font Awesome 3.0, but much appreciated: - - `Font Awesome by Dave Gandy - http://fontawesome.io` -- Full details: http://fontawesome.io/license/ ## Changelog - [v4.7.0 GitHub pull request](https://github.com/FortAwesome/Font-Awesome/pull/10012) @@ -46,12 +44,12 @@ Get started at {{ site.fontawesome.url }}! ## Contributing -Please read through our [contributing guidelines](https://github.com/FortAwesome/Font-Awesome/blob/master/CONTRIBUTING.md). +Please read through our [contributing guidelines](https://github.com/ForkAwesome/Fork-Awesome/blob/master/CONTRIBUTING.md). Included are directions for opening issues, coding standards, and notes on development. ## Versioning -Font Awesome will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered +{{ site.forkawesome.name }} will be maintained under the Semantic Versioning guidelines as much as possible. Releases will be numbered with the following format: `..` @@ -61,10 +59,11 @@ And constructed with the following guidelines: * Breaking backward compatibility bumps the major (and resets the minor and patch) * New additions, including new icons, without breaking backward compatibility bumps the minor (and resets the patch) * Bug fixes, changes to brand logos, and misc changes bumps the patch +* The fork is based on FontAwesome 4.7 and renamed. So it starts at version 0.4.7 For more information on SemVer, please visit http://semver.org. -## Author +## Original authors ot Font Awesome: - Email: {{ site.fontawesome.author.email }} - Twitter: http://twitter.com/{{ site.fontawesome.author.twitter }} - GitHub: https://github.com/{{ site.fontawesome.author.github }} @@ -72,11 +71,11 @@ For more information on SemVer, please visit http://semver.org. ## Component To include as a [component](https://github.com/componentjs/component), just run - $ component install FortAwesome/Font-Awesome + $ component install ForkAwesome/Fork-Awesome Or add - "FortAwesome/Font-Awesome": "*" + "ForkAwesome/Fork-Awesome": "*" to the `dependencies` in your `component.json`. @@ -102,6 +101,6 @@ Build the project and documentation: $ bundle exec jekyll build -Or serve it on a local server on http://localhost:7998/Font-Awesome/: +Or serve it on a local server on http://localhost:7998/Fork-Awesome/: $ bundle exec jekyll -w serve diff --git a/src/_includes/ads/carbon.html b/src/_includes/ads/carbon.html deleted file mode 100644 index d7bccbd1d..000000000 --- a/src/_includes/ads/carbon.html +++ /dev/null @@ -1 +0,0 @@ - diff --git a/src/_includes/footer.html b/src/_includes/footer.html index d15a65524..81074e52e 100644 --- a/src/_includes/footer.html +++ b/src/_includes/footer.html @@ -1,35 +1,20 @@