Skip to content
This repository has been archived by the owner on Dec 5, 2018. It is now read-only.

Commit

Permalink
updating docs for 3.2.1, adding site.fontawesome.minor_version jekyll…
Browse files Browse the repository at this point in the history
… variable as a hack for now
  • Loading branch information
davegandy committed Jun 14, 2013
1 parent a9065a1 commit 9c8f62a
Show file tree
Hide file tree
Showing 18 changed files with 388 additions and 386 deletions.
5 changes: 3 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#[Font Awesome v3.2.0](http://fontawesome.io)
#[Font Awesome v3.2.1](http://fontawesome.io)
###the iconic font designed for Bootstrap

Font Awesome is a full suite of 302 pictographic icons for easy scalable vector graphics on websites, created and
Font Awesome is a full suite of 361 pictographic icons for easy scalable vector graphics on websites, created and
maintained by [Dave Gandy](http://twitter.com/byscuits). Stay up to date [@fontawesome](http://twitter.com/fontawesome).

Get started at http://fontawesome.io!
Expand All @@ -24,6 +24,7 @@ Get started at http://fontawesome.io!
- v3.1.0 - Added 54 icons, icon stacking styles, flipping and rotating icons, removed SASS support
- [v3.1.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=4&page=1&state=closed)
- [v3.2.0 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=3&page=1&state=closed)
- [v3.2.1 GitHub milestones](https://github.com/FortAwesome/Font-Awesome/issues?milestone=5&page=1&state=closed)

##Versioning

Expand Down
3 changes: 2 additions & 1 deletion _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination

fontawesome:
version: 3.2.0
version: 3.2.1
minor_version: 3.2
url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/
blog_url: http://blog.fontawesome.io
Expand Down
2 changes: 1 addition & 1 deletion css/font-awesome-ie7.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome 3.2.0
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
Expand Down
6 changes: 3 additions & 3 deletions css/font-awesome.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome 3.2.0
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
Expand Down Expand Up @@ -27,8 +27,8 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../font/fontawesome-webfont.eot?v=3.2.0');
src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');
src: url('../font/fontawesome-webfont.eot?v=3.2.1');
src: url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'), url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'), url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'), url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');
font-weight: normal;
font-style: normal;
}
Expand Down
2 changes: 1 addition & 1 deletion css/font-awesome.min.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.0');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.0') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.0') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.0') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.0') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
@font-face{font-family:'FontAwesome';src:url('../font/fontawesome-webfont.eot?v=3.2.1');src:url('../font/fontawesome-webfont.eot?#iefix&v=3.2.1') format('embedded-opentype'),url('../font/fontawesome-webfont.woff?v=3.2.1') format('woff'),url('../font/fontawesome-webfont.ttf?v=3.2.1') format('truetype'),url('../font/fontawesome-webfont.svg#fontawesomeregular?v=3.2.1') format('svg');font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;-webkit-font-smoothing:antialiased;*margin-right:.3em;}
[class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;cursor:default;speak:none;}
.icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
a [class^="icon-"],a [class*=" icon-"]{display:inline;}
Expand Down
2 changes: 1 addition & 1 deletion less/font-awesome-ie7.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome 3.2.0
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
Expand Down
2 changes: 1 addition & 1 deletion less/font-awesome.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome 3.2.0
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
Expand Down
4 changes: 2 additions & 2 deletions less/variables.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
// --------------------------

@FontAwesomePath: "../font";
//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/3.2.0/font"; // for referencing Bootstrap CDN font files directly
@FontAwesomeVersion: "3.2.0";
//@FontAwesomePath: "//netdna.bootstrapcdn.com/font-awesome/3.2.1/font"; // for referencing Bootstrap CDN font files directly
@FontAwesomeVersion: "3.2.1";
@borderColor: #eee;
@iconMuted: #eee;
@iconLight: #fff;
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "font-awesome",
"description": "The iconic font designed for Bootstrap",
"version": "3.2.0",
"version": "3.2.1",
"keywords": ["font", "awesome", "fontawesome", "icon", "font", "bootstrap"],
"homepage": "http://fontawesome.io/",
"author": {
Expand Down
2 changes: 1 addition & 1 deletion scss/_variables.scss
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// --------------------------

$FontAwesomePath: "../font" !default;
$FontAwesomeVersion: "3.2.0" !default;
$FontAwesomeVersion: "3.2.1" !default;
$borderColor: #eeeeee !default;
$iconMuted: #eeeeee !default;
$iconLight: white !default;
Expand Down
2 changes: 1 addition & 1 deletion scss/font-awesome-ie7.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome 3.2.0
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
Expand Down
2 changes: 1 addition & 1 deletion scss/font-awesome.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Font Awesome 3.2.0
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/examples/new.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<{% if page.navbar_active == "examples" %}div{% else %}section{% endif %} id="new-styles">
<h2 class="page-header">New Styles in {{ site.fontawesome.version }}</h2>
<h2 class="page-header">New Styles in {{ site.fontawesome.minor_version }}</h2>
<div class="row">
<div class="span4">
<h4><a href="#rotated-flipped">Rotated and Flipped Icons</a></h4>
Expand Down
2 changes: 1 addition & 1 deletion src/_includes/icons.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% capture stripe_ad_content %}
<p class="lead">
You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.version | size }} shiny new icons in version {{ site.fontawesome.version }}.
You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.
Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
<!--The ever-expanding list of Font Awesome {{ site.fontawesome.version }} icons.-->
Need vectors or want to use on the desktop? Check the <a href="{{ page.relative_path }}cheatsheet/">cheatsheet</a>.
Expand Down
6 changes: 3 additions & 3 deletions src/_includes/icons/new.html
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
<{% if page.navbar_active == "icons" %}div{% else %}section{% endif %} id="new">
<h2 class="page-header">New Icons in {{ site.fontawesome.version }}</h2>
<h2 class="page-header">New Icons in {{ site.fontawesome.minor_version }}</h2>
{% if page.navbar_active != "icons" %}
<div class="margin-botom-large">
You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.version | size }} shiny new icons in version {{ site.fontawesome.version }}.
You asked, Font Awesome delivers with {{ icons | version:site.fontawesome.minor_version | size }} shiny new icons in version {{ site.fontawesome.minor_version }}.
Want to request new icons? <a href="{{ page.relative_path }}community/#requesting-new-icons">Here's how</a>.
</div>
{% endif %}

<div class="row the-icons">
{% assign icons_new = icons | expand_aliases | version:site.fontawesome.version %}
{% assign icons_new = icons | expand_aliases | version:site.fontawesome.minor_version %}

{% for icon in icons_new %}
<div class="span3"><a href="{{ page.relative_path }}icon/{{ icon.id }}"><i class="icon-{{ icon.class }}"></i> icon-{{ icon.class }}{% if icon.alias_of %} <span class="muted">(alias)</span>{% endif %}</a></div>
Expand Down
6 changes: 3 additions & 3 deletions src/_includes/whats-new.html
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% 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.version }}. Have some ideas for new features?
{{ site.fontawesome.minor_version }}. Have some ideas for new features?
<a href="{{ page.relative_path }}community/">Help contribute</a>.
</p>
{% endcapture %}
Expand All @@ -10,7 +10,7 @@
<div id="whats-new">
<div class="row">
<div class="span4">
<h4><i class="icon-lightbulb"></i> {{ icons | version:site.fontawesome.version | size }} New Icons in {{ site.fontawesome.version }}</h4>
<h4><i class="icon-lightbulb"></i> {{ icons | version:site.fontawesome.minor_version | size }} New Icons in {{ site.fontawesome.minor_version }}</h4>
Requested by the active community on the <a href="{{ site.fontawesome.github.url }}">Font Awesome GitHub project</a>.
</div>
<div class="span4">
Expand All @@ -26,7 +26,7 @@ <h4><i class="icon-flag icon-flip-horizontal"></i> <a href="{{ page.relative_pat
</div>
<div class="span4 margin-bottom-large">
<h4><i class="icon-magic"></i> Pixel Perfection at 14px</h4>
Version 3.0 was re-created from the ground up to be razor sharp at Bootstrap's default 14px.
Version 3 was re-created from the ground up to be razor sharp at Bootstrap's default 14px.
</div>
<div class="span4">
<h4><i class="icon-th-large"></i> <a href="http://icnfnt.com/">Font Subsetting</a></h4>
Expand Down
Loading

0 comments on commit 9c8f62a

Please sign in to comment.