Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

adding webfonts, general prep for release of new version

  • Loading branch information...
commit bb03bc18edc97f47a046a63673077d961f798b99 1 parent 50c9808
@davegandy davegandy authored
View
3  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;
}
View
3  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;
}
View
BIN  fonts/fontawesome-webfont.eot
Binary file not shown
View
848 fonts/fontawesome-webfont.svg
469 additions, 379 deletions not shown
View
BIN  fonts/fontawesome-webfont.ttf
Binary file not shown
View
BIN  fonts/fontawesome-webfont.woff
Binary file not shown
View
12 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;
}
View
12 src/_includes/jumbotron-carousel.html
@@ -25,17 +25,17 @@
<!-- Carousel items -->
<div class="carousel-inner">
<div class="active item"><div><i class="fa fa-flag"></i></div></div>
- <div class="item"><div><i class="fa fa-compass"></i></div></div>
- <div class="item"><div><i class="fa fa-rocket"></i></div></div>
- <div class="item"><div><i class="fa fa-shield"></i></div></div>
- <div class="item"><div><i class="fa fa-star-half-empty"></i></div></div>
- <div class="item"><div><i class="fa fa-envelope-o"></i></div></div>
- <div class="item"><div><i class="fa fa-medkit"></i></div></div>
+ <div class="item"><div><i class="fa fa-send-o"></i></div></div>
+ <div class="item"><div><i class="fa fa-cube"></i></div></div>
+ <div class="item"><div><i class="fa fa-file-picture-o"></i></div></div>
+ <div class="item"><div><i class="fa fa-life-ring"></i></div></div>
+ <div class="item"><div><i class="fa fa-envelope"></i></div></div>
<div class="item"><div><i class="fa fa-book"></i></div></div>
<div class="item"><div><i class="fa fa-fighter-jet"></i></div></div>
<div class="item"><div><i class="fa fa-beer"></i></div></div>
<div class="item"><div><i class="fa fa-heart-o"></i></div></div>
<div class="item"><div><i class="fa fa-thumbs-o-up"></i></div></div>
+ <div class="item"><div><i class="fa fa-pied-piper-alt"></i></div></div>
</div>
<!-- Carousel nav -->
<a class="carousel-control left" href="#icon-carousel" data-slide="prev"
View
8 src/_includes/new-features.html
@@ -1,11 +1,3 @@
-{% capture stripe_ad_content %}
-<p class="lead">
- 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?
- <a href="{{ page.relative_path }}community/">Help contribute</a>.
-</p>
-{% endcapture %}
-{% include stripe-ad.html %}
<section id="whats-new" class="feature-list">
<div class="row">
View
BIN  src/assets/font-awesome/fonts/fontawesome-webfont.eot
Binary file not shown
View
848 src/assets/font-awesome/fonts/fontawesome-webfont.svg
469 additions, 379 deletions not shown
View
BIN  src/assets/font-awesome/fonts/fontawesome-webfont.ttf
Binary file not shown
View
BIN  src/assets/font-awesome/fonts/fontawesome-webfont.woff
Binary file not shown
View
12 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;
}
View
2  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 {
View
2  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;
}
View
2  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;
View
2  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;
}
View
13 src/whats-new.html
@@ -11,8 +11,15 @@
{% include stripe-social.html %}
<div class="container">
- {% include new-features.html %}
- {% include new-naming.html %}
- {% include new-upgrading.html %}
+ {% capture stripe_ad_content %}
+ <p class="lead">
+ 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?
+ <a href="{{ page.relative_path }}community/">Help contribute</a>.
+ </p>
+ {% endcapture %}
+ {% include stripe-ad.html %}
+
{% include icons/new.html %}
+ {% include new-upgrading.html %}
</div>
Please sign in to comment.
Something went wrong with that request. Please try again.