updating version to 4.0.2 in config.yml, adding documentation for FA SASS and LESS ruby gems (#2336)

This commit is contained in:
davegandy 2013-11-04 11:38:17 -05:00
parent ce24250707
commit 76921acf0a
8 changed files with 46 additions and 19 deletions

View File

@ -19,7 +19,7 @@ icon_layout: icon.html # Relative to _layouts directory
icon_destination: icon # Relative to destination
fontawesome:
version: 4.0.1
version: 4.0.2
minor_version: 4.0
url: http://fontawesome.io
legacy_url: http://fortawesome.github.com/Font-Awesome/

View File

@ -1,5 +1,5 @@
/*!
* Font Awesome 4.0.1
* Font Awesome 4.0.2
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be
@ -27,8 +27,8 @@
* -------------------------- */
@font-face {
font-family: 'FontAwesome';
src: url('../fonts/fontawesome-webfont.eot?v=4.0.1');
src: url('../fonts/fontawesome-webfont.eot?v=4.0.1#iefix') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg');
src: url('../fonts/fontawesome-webfont.eot?v=4.0.2');
src: url('../fonts/fontawesome-webfont.eot?v=4.0.2#iefix') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.0.2') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.0.2') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.0.2#fontawesomeregular') format('svg');
font-weight: normal;
font-style: normal;
}

View File

@ -1,4 +1,4 @@
@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.1');src:url('../fonts/fontawesome-webfont.eot?v=4.0.1#iefix') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.1') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.1') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.1#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.0.2');src:url('../fonts/fontawesome-webfont.eot?v=4.0.2#iefix') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.0.2') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.0.2') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.0.2#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font-family:FontAwesome;font-style:normal;font-weight:normal;line-height:1;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}
.fa-lg{font-size:1.3333333333333333em;line-height:.75em;vertical-align:-15%}
.fa-2x{font-size:2em}
.fa-3x{font-size:3em}

View File

@ -1,5 +1,5 @@
/*!
* Font Awesome 4.0.1
* Font Awesome 4.0.2
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be

View File

@ -2,9 +2,9 @@
// --------------------------
@fa-font-path: "../fonts";
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.0.1/fonts"; // for referencing Bootstrap CDN font files directly
//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.0.2/fonts"; // for referencing Bootstrap CDN font files directly
@fa-css-prefix: fa;
@fa-version: "4.0.1";
@fa-version: "4.0.2";
@fa-border-color: #eee;
@fa-inverse: #fff;
@fa-li-width: (30em / 14);

View File

@ -2,9 +2,9 @@
// --------------------------
$fa-font-path: "../fonts" !default;
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.0.1/fonts" !default; // for referencing Bootstrap CDN font files directly
//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.0.2/fonts" !default; // for referencing Bootstrap CDN font files directly
$fa-css-prefix: fa !default;
$fa-version: "4.0.1" !default;
$fa-version: "4.0.2" !default;
$fa-border-color: #eee !default;
$fa-inverse: #fff !default;
$fa-li-width: (30em / 14) !default;

View File

@ -1,5 +1,5 @@
/*!
* Font Awesome 4.0.1
* Font Awesome 4.0.2
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
* The full suite of pictographic icons, examples, and documentation can be

View File

@ -55,11 +55,38 @@ relative_path: ../
</ol>
</section>
<section id="ruby-gem">
<h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-sass">Font Awesome Ruby Gem</a></h2>
<section id="ruby-gem-less">
<h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-less">LESS Ruby Gem</a></h2>
<p>
Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome Ruby Gem</a> to easily get Font
Awesome into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
Use the <a href="https://github.com/FortAwesome/font-awesome-less">Official Font Awesome LESS Ruby Gem</a> to easily get Font
Awesome LESS into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
</p>
<ol>
<li>
Add this line to your application's Gemfile:
{% highlight bash %}
gem 'font-awesome-less'
{% endhighlight %}
</li>
<li>
And then execute:
{% highlight bash %}
$ bundle
{% endhighlight %}
</li>
<li>Or install it yourself as:
{% highlight bash %}
$ gem install font-awesome-less
{% endhighlight %}
</li>
</ol>
</section>
<section id="ruby-gem-sass">
<h2 class="page-header">EASY: <a href="https://github.com/FortAwesome/font-awesome-sass">SASS Ruby Gem</a></h2>
<p>
Use the <a href="https://github.com/FortAwesome/font-awesome-sass">Official Font Awesome SASS Ruby Gem</a> to easily get Font
Awesome SASS into a Rails project. Generously maintained by <a href="https://twitter.com/supercodepoet/">@supercodepoet</a>.
</p>
<ol>
<li>
@ -83,19 +110,19 @@ $ gem install font-awesome-sass
</section>
<section id="custom-less">
<h2 class="page-header">PRO: Custom LESS or SCSS</h2>
<p>Use this method to customize Font Awesome {{ site.fontawesome.version }} using LESS or SCSS.</p>
<h2 class="page-header">PRO: Custom LESS or SASS</h2>
<p>Use this method to customize Font Awesome {{ site.fontawesome.version }} using LESS or SASS.</p>
<ol>
<li>Copy the <code>font-awesome/</code> directory into your project.</li>
<li>
Open your project's font-awesome/variables.less and edit the <code>@fa-font-path</code> or <code>$fa-font-path</code>
Open your project's <code>font-awesome/less/variables.less</code> or <code>font-awesome/scss/_variables.scss</code> and edit the <code>@fa-font-path</code> or <code>$fa-font-path</code>
variable to point to your font directory.
{% highlight scss %}
@fa-font-path: "../font";
{% endhighlight %}
<p class="alert alert-success"><i class="fa fa-info-circle"></i> The font path is relative from your compiled CSS directory.</p>
</li>
<li>Re-compile your LESS or SCSS if using a static compiler. Otherwise, you should be good to go.</li>
<li>Re-compile your LESS or SASS if using a static compiler. Otherwise, you should be good to go.</li>
<li>Check out the <a href="{{ page.relative_path }}examples/">examples</a> to start using Font Awesome!</li>
</ol>
</section>