Skip to content

Commit

Permalink
Update to 5.0.6
Browse files Browse the repository at this point in the history
  • Loading branch information
ammarfrahm committed Feb 11, 2018
1 parent a67733b commit 67563c8
Show file tree
Hide file tree
Showing 78 changed files with 11,353 additions and 7,922 deletions.
14 changes: 7 additions & 7 deletions Makefile
@@ -1,13 +1,13 @@
REF =
REF =

default: data
@mkdir -p css fonts scss less
@mkdir -p css webfonts scss less
@cd $< && git remote update && git checkout master && ( git branch -D work || true ) && git checkout -b work $(REF)
@cp -f $</css/* ./css
@cp -f $</fonts/* ./fonts
@cp -f $</scss/* ./scss
@cp -f $</less/* ./less
@du -bh css* font* scss* less*
@cp -f $</web-fonts-with-css/css/* ./css
@cp -f $</web-fonts-with-css/webfonts/* ./webfonts
@cp -f $</web-fonts-with-css/scss/* ./scss
@cp -f $</web-fonts-with-css/less/* ./less
@du -bh css* webfonts* scss* less*

data:
@git clone https://github.com/FortAwesome/Font-Awesome.git $@
Expand Down
28 changes: 19 additions & 9 deletions bower.json
@@ -1,21 +1,31 @@
{
"name": "components-font-awesome",
"description": "Font Awesome, the iconic font designed for use with Twitter Bootstrap.",
"description": "Font Awesome, the iconic SVG, font, and CSS framework.",
"repository": {
"type": "git",
"url": "git://github.com/components/font-awesome.git"
},
"main": [
"css/font-awesome.css",
"css/font-awesome.css.map",
"scss/font-awesome.scss",
"fonts/fontawesome-webfont.eot",
"fonts/fontawesome-webfont.woff",
"fonts/fontawesome-webfont.woff2",
"fonts/fontawesome-webfont.ttf",
"fonts/fontawesome-webfont.svg"
"css/fontawesome-all.css",
"scss/fontawesome.scss",
"webfonts/fa-brands-400.eot",
"webfonts/fa-brands-400.woff2",
"webfonts/fa-brands-400.woff",
"webfonts/fa-brands-400.ttf",
"webfonts/fa-brands-400.svg",
"webfonts/fa-regular-400.eot",
"webfonts/fa-regular-400.woff2",
"webfonts/fa-regular-400.woff",
"webfonts/fa-regular-400.ttf",
"webfonts/fa-regular-400.svg",
"webfonts/fa-solid-900.eot",
"webfonts/fa-solid-900.woff2",
"webfonts/fa-solid-900.woff",
"webfonts/fa-solid-900.ttf",
"webfonts/fa-solid-900.svg"
],
"license": [
"CC-BY-4.0",
"MIT",
"OFL-1.1"
],
Expand Down
29 changes: 19 additions & 10 deletions component.json
@@ -1,21 +1,30 @@
{
"name": "font-awesome",
"repo": "components/font-awesome",
"version": "4.7.0",
"description": "Font Awesome, the iconic font designed for use with Twitter Bootstrap.",
"version": "5.0.6",
"description": "Font Awesome, the iconic SVG, font, and CSS framework.",
"styles": [
"css/font-awesome.css"
"css/fontawesome-all.css"
],
"files": [
"css/font-awesome.css.map",
"fonts/FontAwesome.otf",
"fonts/fontawesome-webfont.eot",
"fonts/fontawesome-webfont.svg",
"fonts/fontawesome-webfont.ttf",
"fonts/fontawesome-webfont.woff",
"fonts/fontawesome-webfont.woff2"
"webfonts/fa-brands-400.eot",
"webfonts/fa-brands-400.woff2",
"webfonts/fa-brands-400.woff",
"webfonts/fa-brands-400.ttf",
"webfonts/fa-brands-400.svg",
"webfonts/fa-regular-400.eot",
"webfonts/fa-regular-400.woff2",
"webfonts/fa-regular-400.woff",
"webfonts/fa-regular-400.ttf",
"webfonts/fa-regular-400.svg",
"webfonts/fa-solid-900.eot",
"webfonts/fa-solid-900.woff2",
"webfonts/fa-solid-900.woff",
"webfonts/fa-solid-900.ttf",
"webfonts/fa-solid-900.svg"
],
"license": [
"CC-BY-4.0",
"MIT",
"OFL-1.1"
]
Expand Down
10 changes: 5 additions & 5 deletions composer.json
@@ -1,20 +1,20 @@
{
"name": "components/font-awesome",
"description": "The iconic font designed for use with Twitter Bootstrap.",
"description": "Font Awesome, the iconic SVG, font, and CSS framework.",
"type": "component",
"license": [
"CC-BY-4.0",
"MIT",
"OFL-1.1"
],
"extra": {
"component": {
"styles": [
"css/font-awesome.css"
"css/fontawesome-all.css"
],
"files": [
"css/font-awesome.min.css",
"css/font-awesome.css.map",
"fonts/*"
"css/fontawesome-all.min.css",
"webfonts/*"
]
}
}
Expand Down
13 changes: 13 additions & 0 deletions css/fa-brands.css
@@ -0,0 +1,13 @@
/*!
* Font Awesome Free 5.0.6 by @fontawesome - http://fontawesome.com
* License - http://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
@font-face {
font-family: 'Font Awesome 5 Brands';
font-style: normal;
font-weight: normal;
src: url("../webfonts/fa-brands-400.eot");
src: url("../webfonts/fa-brands-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-brands-400.woff2") format("woff2"), url("../webfonts/fa-brands-400.woff") format("woff"), url("../webfonts/fa-brands-400.ttf") format("truetype"), url("../webfonts/fa-brands-400.svg#fontawesome") format("svg"); }

.fab {
font-family: 'Font Awesome 5 Brands'; }
5 changes: 5 additions & 0 deletions css/fa-brands.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions css/fa-regular.css
@@ -0,0 +1,14 @@
/*!
* Font Awesome Free 5.0.6 by @fontawesome - http://fontawesome.com
* License - http://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 400;
src: url("../webfonts/fa-regular-400.eot");
src: url("../webfonts/fa-regular-400.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-regular-400.woff2") format("woff2"), url("../webfonts/fa-regular-400.woff") format("woff"), url("../webfonts/fa-regular-400.ttf") format("truetype"), url("../webfonts/fa-regular-400.svg#fontawesome") format("svg"); }

.far {
font-family: 'Font Awesome 5 Free';
font-weight: 400; }
5 changes: 5 additions & 0 deletions css/fa-regular.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions css/fa-solid.css
@@ -0,0 +1,15 @@
/*!
* Font Awesome Free 5.0.6 by @fontawesome - http://fontawesome.com
* License - http://fontawesome.com/license (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
@font-face {
font-family: 'Font Awesome 5 Free';
font-style: normal;
font-weight: 900;
src: url("../webfonts/fa-solid-900.eot");
src: url("../webfonts/fa-solid-900.eot?#iefix") format("embedded-opentype"), url("../webfonts/fa-solid-900.woff2") format("woff2"), url("../webfonts/fa-solid-900.woff") format("woff"), url("../webfonts/fa-solid-900.ttf") format("truetype"), url("../webfonts/fa-solid-900.svg#fontawesome") format("svg"); }

.fa,
.fas {
font-family: 'Font Awesome 5 Free';
font-weight: 900; }
5 changes: 5 additions & 0 deletions css/fa-solid.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 67563c8

Please sign in to comment.