FlandreScarle7/Font-Awesome
1
0
Fork 0
mirror of https://github.com/FortAwesome/Font-Awesome.git synced 2024-12-27 14:01:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FortAwesome/Font-Awesome

Browse Source
This commit is contained in:
Dave Gandy 2016-02-22 14:46:37 -05:00
commit f351d27db6
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -2,7 +2,7 @@
### The iconic font and CSS framework
Font Awesome is a full suite of 605 pictographic icons for easy scalable vector graphics on websites,
created and maintained by [Dave Gandy](http://twitter.com/davegandy).
created and maintained by [Dave Gandy](https://twitter.com/davegandy).
Stay up to date with the latest release and announcements on Twitter:
[@fontawesome](http://twitter.com/fontawesome).
@ -12,12 +12,12 @@ Get started at http://fontawesome.io!
- The Font Awesome font is licensed under the SIL OFL 1.1:
- http://scripts.sil.org/OFL
- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
- http://opensource.org/licenses/mit-license.html
- https://opensource.org/licenses/mit-license.html
- The Font Awesome documentation is licensed under the CC BY 3.0 License:
- http://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
- Full details: http://fontawesome.io/license/
## Changelog
- [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
@ -63,7 +63,7 @@ For more information on SemVer, please visit http://semver.org.
- GitHub: https://github.com/davegandy
## Component
To include as a [component](http://github.com/component/component), just run
To include as a [component](https://github.com/componentjs/component), just run
$ component install FortAwesome/Font-Awesome

8
src/README.md-nobuild
View File

@ -4,7 +4,7 @@
### The iconic font and CSS framework
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 }}](http://twitter.com/{{ site.fontawesome.author.twitter }}).
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 }}](http://twitter.com/{{ site.fontawesome.twitter }}).
@ -14,12 +14,12 @@ Get started at {{ site.fontawesome.url }}!
- The Font Awesome font is licensed under the SIL OFL 1.1:
- http://scripts.sil.org/OFL
- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
- http://opensource.org/licenses/mit-license.html
- https://opensource.org/licenses/mit-license.html
- The Font Awesome documentation is licensed under the CC BY 3.0 License:
- http://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
- Full details: http://fontawesome.io/license/
## Changelog
- [v4.5.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.5.0+is%3Aclosed)
@ -65,7 +65,7 @@ For more information on SemVer, please visit http://semver.org.
- GitHub: https://github.com/{{ site.fontawesome.author.github }}
## Component
To include as a [component](http://github.com/component/component), just run
To include as a [component](https://github.com/componentjs/component), just run
$ component install FortAwesome/Font-Awesome

2
src/icons.yml
View File

@ -5597,6 +5597,8 @@ icons:
id: industry
unicode: f275
created: 4.4
filter:
- factory
categories:
- Web Application Icons