diff --git a/css/font-awesome.css b/css/font-awesome.css index e44e1462a..eb4127b73 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -6,7 +6,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fonts/FontAwesome.otf') format('opentype'); + src: url('../fonts/fontawesome-webfont.eot?v=4.1.0'); + src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index e44e1462a..eb4127b73 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -6,7 +6,8 @@ * -------------------------- */ @font-face { font-family: 'FontAwesome'; - src: url('../fonts/FontAwesome.otf') format('opentype'); + src: url('../fonts/fontawesome-webfont.eot?v=4.1.0'); + src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.1.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.1.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.1.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.1.0#fontawesomeregular') format('svg'); font-weight: normal; font-style: normal; } diff --git a/fonts/fontawesome-webfont.eot b/fonts/fontawesome-webfont.eot index 7c79c6a6b..6cfd56609 100755 Binary files a/fonts/fontawesome-webfont.eot and b/fonts/fontawesome-webfont.eot differ diff --git a/fonts/fontawesome-webfont.svg b/fonts/fontawesome-webfont.svg index 45fdf3383..a9f846950 100755 --- a/fonts/fontawesome-webfont.svg +++ b/fonts/fontawesome-webfont.svg @@ -14,10 +14,11 @@ + - + - + @@ -30,385 +31,474 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fonts/fontawesome-webfont.ttf b/fonts/fontawesome-webfont.ttf index e89738de5..5cd6cff6d 100755 Binary files a/fonts/fontawesome-webfont.ttf and b/fonts/fontawesome-webfont.ttf differ diff --git a/fonts/fontawesome-webfont.woff b/fonts/fontawesome-webfont.woff index 8c1748aab..9eaecb379 100755 Binary files a/fonts/fontawesome-webfont.woff and b/fonts/fontawesome-webfont.woff differ diff --git a/less/path.less b/less/path.less index 6b03074d8..d73bff8b5 100644 --- a/less/path.less +++ b/less/path.less @@ -3,12 +3,12 @@ @font-face { font-family: 'FontAwesome'; -// src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')"; -// src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')", -// ~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')", -// ~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')", -// ~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')"; - src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')"; + src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')", + ~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')", + ~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')", + ~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')"; +// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/src/_includes/jumbotron-carousel.html b/src/_includes/jumbotron-carousel.html index b0ea25278..1bb749df1 100644 --- a/src/_includes/jumbotron-carousel.html +++ b/src/_includes/jumbotron-carousel.html @@ -25,17 +25,17 @@ - Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome - {{ site.fontawesome.minor_version }}. Have some ideas for new features? - Help contribute. -

-{% endcapture %} -{% include stripe-ad.html %}
diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.eot b/src/assets/font-awesome/fonts/fontawesome-webfont.eot index 7c79c6a6b..6cfd56609 100755 Binary files a/src/assets/font-awesome/fonts/fontawesome-webfont.eot and b/src/assets/font-awesome/fonts/fontawesome-webfont.eot differ diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.svg b/src/assets/font-awesome/fonts/fontawesome-webfont.svg index 45fdf3383..a9f846950 100755 --- a/src/assets/font-awesome/fonts/fontawesome-webfont.svg +++ b/src/assets/font-awesome/fonts/fontawesome-webfont.svg @@ -14,10 +14,11 @@ + - + - + @@ -30,385 +31,474 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf index e89738de5..5cd6cff6d 100755 Binary files a/src/assets/font-awesome/fonts/fontawesome-webfont.ttf and b/src/assets/font-awesome/fonts/fontawesome-webfont.ttf differ diff --git a/src/assets/font-awesome/fonts/fontawesome-webfont.woff b/src/assets/font-awesome/fonts/fontawesome-webfont.woff index 8c1748aab..9eaecb379 100755 Binary files a/src/assets/font-awesome/fonts/fontawesome-webfont.woff and b/src/assets/font-awesome/fonts/fontawesome-webfont.woff differ diff --git a/src/assets/font-awesome/less/path.less b/src/assets/font-awesome/less/path.less index 6b03074d8..d73bff8b5 100644 --- a/src/assets/font-awesome/less/path.less +++ b/src/assets/font-awesome/less/path.less @@ -3,12 +3,12 @@ @font-face { font-family: 'FontAwesome'; -// src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')"; -// src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')", -// ~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')", -// ~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')", -// ~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')"; - src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts + src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}')"; + src: ~"url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype')", + ~"url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff')", + ~"url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype')", + ~"url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg')"; +// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts font-weight: normal; font-style: normal; } diff --git a/src/assets/less/site/jumbotron-carousel.less b/src/assets/less/site/jumbotron-carousel.less index ab7568aff..1dce202cd 100644 --- a/src/assets/less/site/jumbotron-carousel.less +++ b/src/assets/less/site/jumbotron-carousel.less @@ -3,7 +3,7 @@ margin-top: @buffer-sm; font-size: @size; text-align: center; - line-height: @size + 5; + line-height: @size + 20; text-shadow: 0 2px 0 rgba(0,0,0,0.15); } .carousel-control { diff --git a/src/assets/less/site/responsive/screen-lg.less b/src/assets/less/site/responsive/screen-lg.less index 3e0d9bbdb..37d19a682 100644 --- a/src/assets/less/site/responsive/screen-lg.less +++ b/src/assets/less/site/responsive/screen-lg.less @@ -2,7 +2,7 @@ #icon-carousel { @size: 240px; font-size: @size; - line-height: @size + 5; + line-height: @size + 20; margin-top: @buffer-lg; } diff --git a/src/assets/less/site/responsive/screen-sm.less b/src/assets/less/site/responsive/screen-sm.less index 5065ba96f..8e289b6e9 100644 --- a/src/assets/less/site/responsive/screen-sm.less +++ b/src/assets/less/site/responsive/screen-sm.less @@ -2,7 +2,7 @@ #icon-carousel { @size: 200px; font-size: @size; - line-height: @size + 5; + line-height: @size + 20; } .carousel-control { top: @size - 10px; diff --git a/src/assets/less/site/responsive/screen-xs.less b/src/assets/less/site/responsive/screen-xs.less index df6d92667..dcd706307 100644 --- a/src/assets/less/site/responsive/screen-xs.less +++ b/src/assets/less/site/responsive/screen-xs.less @@ -2,7 +2,7 @@ #icon-carousel { @size: 180px; font-size: @size; - line-height: @size; + line-height: @size + 20; width: 280px; margin: 30px auto 0; } diff --git a/src/whats-new.html b/src/whats-new.html index 088502573..cd2e9a33e 100644 --- a/src/whats-new.html +++ b/src/whats-new.html @@ -11,8 +11,15 @@ relative_path: ../ {% include stripe-social.html %}
- {% include new-features.html %} - {% include new-naming.html %} - {% include new-upgrading.html %} + {% capture stripe_ad_content %} +

+ Font Awesome is always getting a little awesome-er. So here's what's new in the latest version, Font Awesome + {{ site.fontawesome.minor_version }}. Have some ideas for new features? + Help contribute. +

+ {% endcapture %} + {% include stripe-ad.html %} + {% include icons/new.html %} + {% include new-upgrading.html %}