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

Updating versions

Browse Source
This commit is contained in:
Dave Gandy 2015-08-12 11:17:55 -07:00
parent 7bbdfb322f
commit 71057e102d
12 changed files with 27 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README.md
View File

@ -1,4 +1,4 @@
#[Font Awesome v4.4.0](http://fontawesome.io) #[Font Awesome v5.0.0](http://fontawesome.io)
###The iconic font and CSS framework ###The iconic font and CSS framework
Font Awesome is a full suite of 585 pictographic icons for easy scalable vector graphics on websites, Font Awesome is a full suite of 585 pictographic icons for easy scalable vector graphics on websites,
@ -35,6 +35,7 @@ Get started at http://fontawesome.io!
- [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed) - [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed)
- [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed) - [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed)
- [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed) - [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed)
- [v5.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A5.0.0+is%3Aclosed)
## Contributing ## Contributing

8
_config.yml
View File

@ -19,10 +19,10 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination icon_destination: icon # Relative to destination
fontawesome: fontawesome:
version: 4.4.0 version: 5.0.0
minor_version: 4.4 minor_version: 5.0
major_version: 4 major_version: 5
doc_blob: v4.4.0 doc_blob: v5.0.0
url: http://fontawesome.io url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/ legacy_url: http://fortawesome.github.com/Font-Awesome/
blog_url: http://blog.fontawesome.io blog_url: http://blog.fontawesome.io

6
css/font-awesome.css vendored
View File

@ -1,13 +1,13 @@
/*! /*!
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 5.0.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */
/* FONT PATH /* FONT PATH
* -------------------------- */ * -------------------------- */
@font-face { @font-face {
font-family: 'FontAwesome'; font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.4.0'); src: url('../fonts/fontawesome-webfont.eot?v=5.0.0');
src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.4.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=4.4.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=4.4.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.4.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.4.0#fontawesomeregular') format('svg'); src: url('../fonts/fontawesome-webfont.eot?#iefix&v=5.0.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff2?v=5.0.0') format('woff2'), url('../fonts/fontawesome-webfont.woff?v=5.0.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=5.0.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=5.0.0#fontawesomeregular') format('svg');
font-weight: normal; font-weight: normal;
font-style: normal; font-style: normal;
} }

4
css/font-awesome.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
less/font-awesome.less vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 5.0.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */

4
less/variables.less
View File

@ -4,9 +4,9 @@
@fa-font-path: "../fonts"; @fa-font-path: "../fonts";
@fa-font-size-base: 14px; @fa-font-size-base: 14px;
@fa-line-height-base: 1; @fa-line-height-base: 1;
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts"; // for referencing Bootstrap CDN font files directly //@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/5.0.0/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: fa; @fa-css-prefix: fa;
@fa-version: "4.4.0"; @fa-version: "5.0.0";
@fa-border-color: #eee; @fa-border-color: #eee;
@fa-inverse: #fff; @fa-inverse: #fff;
@fa-li-width: (30em / 14); @fa-li-width: (30em / 14);

4
scss/_variables.scss
View File

@ -4,9 +4,9 @@
$fa-font-path: "../fonts" !default; $fa-font-path: "../fonts" !default;
$fa-font-size-base: 14px !default; $fa-font-size-base: 14px !default;
$fa-line-height-base: 1 !default; $fa-line-height-base: 1 !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.4.0/fonts" !default; // for referencing Bootstrap CDN font files directly //$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/5.0.0/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: fa !default; $fa-css-prefix: fa !default;
$fa-version: "4.4.0" !default; $fa-version: "5.0.0" !default;
$fa-border-color: #eee !default; $fa-border-color: #eee !default;
$fa-inverse: #fff !default; $fa-inverse: #fff !default;
$fa-li-width: (30em / 14) !default; $fa-li-width: (30em / 14) !default;

2
scss/font-awesome.scss vendored
View File

@ -1,5 +1,5 @@
/*! /*!
* Font Awesome 4.4.0 by @davegandy - http://fontawesome.io - @fontawesome * Font Awesome 5.0.0 by @davegandy - http://fontawesome.io - @fontawesome
* License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
*/ */

1
src/README.md-nobuild
View File

@ -37,6 +37,7 @@ Get started at {{ site.fontawesome.url }}!
- [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed) - [v4.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=12&page=1&state=closed)
- [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed) - [v4.3.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.3.0+is%3Aclosed)
- [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed) - [v4.4.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A4.4.0+is%3Aclosed)
- [v5.0.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?q=milestone%3A5.0.0+is%3Aclosed)
## Contributing ## Contributing

4
src/_includes/modals/download.html
View File

@ -8,7 +8,7 @@
<div class="modal-body text-lg"> <div class="modal-body text-lg">
<p class="margin-bottom-lg"> <p class="margin-bottom-lg">
I hope you love Font Awesome. If you've found it useful, I hope you love Font Awesome. If you've found it useful,
<a class="strong" href="https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=download_modal&utm_campaign=promo_4.4_update" target="_blank"> <a class="strong" href="https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=download_modal&utm_campaign=promo_5.0_update" target="_blank">
please do me a favor and check out my latest project, Fonticons</a>. It makes it easy to put the perfect please do me a favor and check out my latest project, Fonticons</a>. 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. icons on your website. Choose from our awesome, comprehensive icon sets or copy and paste your own.
</p> </p>
@ -25,7 +25,7 @@
<i class="fa fa-download fa-lg"></i>&nbsp; <i class="fa fa-download fa-lg"></i>&nbsp;
Download Download
</a> </a>
<a class="btn btn-success btn-lg block-xs" href="https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=download_modal&utm_campaign=promo_4.4_update" target="_blank"> <a class="btn btn-success btn-lg block-xs" href="https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=download_modal&utm_campaign=promo_5.0_update" target="_blank">
Check out Fonticons &nbsp;<i class="fa fa-external-link fa-lg"></i> Check out Fonticons &nbsp;<i class="fa fa-external-link fa-lg"></i>
</a> </a>
</div> </div>

12
src/assets/js/site.js
View File

@ -5,25 +5,25 @@ $(function() {
{ {
quote: "Take your icon game to the next level. Check out <strong>Fonticons</strong>, from the maker of Font Awesome.", quote: "Take your icon game to the next level. Check out <strong>Fonticons</strong>, from the maker of Font Awesome.",
class: "fonticons", class: "fonticons",
url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_4.4_update", url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_1_next_level&utm_campaign=promo_5.0_update",
btn_text: "Gimme Some!" btn_text: "Gimme Some!"
}, },
{ {
quote: "Make your icons load 10x faster! Check out <strong>Fonticons</strong>, from the maker of Font Awesome.", quote: "Make your icons load 10x faster! Check out <strong>Fonticons</strong>, from the maker of Font Awesome.",
class: "fonticons", class: "fonticons",
url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_3_faster_loading&utm_campaign=promo_4.4_update", url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_3_faster_loading&utm_campaign=promo_5.0_update",
btn_text: "Gimme Some!" btn_text: "Gimme Some!"
}, },
{ {
quote: "Looking for other great icon sets? Check out <strong>Fonticons</strong>, from the maker of Font Awesome.", quote: "Looking for other great icon sets? Check out <strong>Fonticons</strong>, from the maker of Font Awesome.",
class: "fonticons", class: "fonticons",
url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_4_more_icons&utm_campaign=promo_4.4_update", url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_4_more_icons&utm_campaign=promo_5.0_update",
btn_text: "Gimme Some!" btn_text: "Gimme Some!"
}, },
{ {
quote: "Want to add your own icon? Check out <strong>Fonticons</strong>, from the maker of Font Awesome.", quote: "Want to add your own icon? Check out <strong>Fonticons</strong>, from the maker of Font Awesome.",
class: "fonticons", class: "fonticons",
url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_your_own_icon&utm_campaign=promo_4.4_update", url: "https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_6_your_own_icon&utm_campaign=promo_5.0_update",
btn_text: "Gimme Some!" btn_text: "Gimme Some!"
}, },
@ -32,13 +32,13 @@ $(function() {
{ {
quote: "<strong>Black Tie</strong>, from the creator of Font Awesome. On sale at the Kickstarter price for a limited time.", quote: "<strong>Black Tie</strong>, from the creator of Font Awesome. On sale at the Kickstarter price for a limited time.",
class: "black-tie", class: "black-tie",
url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_2_kickstarter&utm_campaign=promo_4.4_update", url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_2_kickstarter&utm_campaign=promo_5.0_update",
btn_text: "Check it Out!" btn_text: "Check it Out!"
}, },
{ {
quote: "Want clean, minimalist icons? Check out <strong>Black Tie</strong>, the new multi-weight icon font from the maker of Font Awesome.", quote: "Want clean, minimalist icons? Check out <strong>Black Tie</strong>, the new multi-weight icon font from the maker of Font Awesome.",
class: "black-tie", class: "black-tie",
url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_5_clean_minimalist&utm_campaign=promo_4.4_update", url: "http://blacktie.io/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=ad_5_clean_minimalist&utm_campaign=promo_5.0_update",
btn_text: "Check it Out!" btn_text: "Check it Out!"
} }
]; ];

2
src/thanks.html
View File

@ -21,7 +21,7 @@ relative_path: ../
on your website. Pick from gorgeous, comprehensive icon sets or copy and paste your own vector icons. on your website. Pick from gorgeous, comprehensive icon sets or copy and paste your own vector icons.
</p> </p>
<a href="https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=subscribe_thanks&utm_campaign=promo_4.4_update" class="btn btn-lg btn-success">Check out Fonticons!</a> <a href="https://fonticons.com/?utm_source=font_awesome_homepage&utm_medium=display&utm_content=subscribe_thanks&utm_campaign=promo_5.0_update" class="btn btn-lg btn-success">Check out Fonticons!</a>
</div> </div>
</div> </div>