From 76921acf0a11dbab650bc033d7d785501c729d32 Mon Sep 17 00:00:00 2001 From: davegandy Date: Mon, 4 Nov 2013 11:38:17 -0500 Subject: [PATCH] updating version to 4.0.2 in config.yml, adding documentation for FA SASS and LESS ruby gems (#2336) --- _config.yml | 2 +- css/font-awesome.css | 6 +++--- css/font-awesome.min.css | 2 +- less/font-awesome.less | 2 +- less/variables.less | 4 ++-- scss/_variables.scss | 4 ++-- scss/font-awesome.scss | 2 +- src/get-started.html | 43 ++++++++++++++++++++++++++++++++-------- 8 files changed, 46 insertions(+), 19 deletions(-) diff --git a/_config.yml b/_config.yml index d1e81d345..66db680c4 100644 --- a/_config.yml +++ b/_config.yml @@ -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/ diff --git a/css/font-awesome.css b/css/font-awesome.css index 3d0d1777c..f39e7265d 100644 --- a/css/font-awesome.css +++ b/css/font-awesome.css @@ -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; } diff --git a/css/font-awesome.min.css b/css/font-awesome.min.css index 500e2736e..ffcf8ef7f 100644 --- a/css/font-awesome.min.css +++ b/css/font-awesome.min.css @@ -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} diff --git a/less/font-awesome.less b/less/font-awesome.less index a853e0c1e..c0d2a88ca 100644 --- a/less/font-awesome.less +++ b/less/font-awesome.less @@ -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 diff --git a/less/variables.less b/less/variables.less index db875b462..12b1df04d 100644 --- a/less/variables.less +++ b/less/variables.less @@ -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); diff --git a/scss/_variables.scss b/scss/_variables.scss index cd8014009..a5dd800c8 100644 --- a/scss/_variables.scss +++ b/scss/_variables.scss @@ -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; diff --git a/scss/font-awesome.scss b/scss/font-awesome.scss index a853e0c1e..c0d2a88ca 100644 --- a/scss/font-awesome.scss +++ b/scss/font-awesome.scss @@ -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 diff --git a/src/get-started.html b/src/get-started.html index bb752872d..c7936a0dd 100644 --- a/src/get-started.html +++ b/src/get-started.html @@ -55,11 +55,38 @@ relative_path: ../ -
-

EASY: Font Awesome Ruby Gem

+
+

EASY: LESS Ruby Gem

- Use the Official Font Awesome Ruby Gem to easily get Font - Awesome into a Rails project. Generously maintained by @supercodepoet. + Use the Official Font Awesome LESS Ruby Gem to easily get Font + Awesome LESS into a Rails project. Generously maintained by @supercodepoet. +

+
    +
  1. + Add this line to your application's Gemfile: +{% highlight bash %} +gem 'font-awesome-less' +{% endhighlight %} +
    2. +
  2. + And then execute: +{% highlight bash %} +$ bundle +{% endhighlight %} +
    3. +
  3. Or install it yourself as: +{% highlight bash %} +$ gem install font-awesome-less +{% endhighlight %} +
    4. +
+
+ +
+

EASY: SASS Ruby Gem

+

+ Use the Official Font Awesome SASS Ruby Gem to easily get Font + Awesome SASS into a Rails project. Generously maintained by @supercodepoet.

  1. @@ -83,19 +110,19 @@ $ gem install font-awesome-sass
-

PRO: Custom LESS or SCSS

-

Use this method to customize Font Awesome {{ site.fontawesome.version }} using LESS or SCSS.

+

PRO: Custom LESS or SASS

+

Use this method to customize Font Awesome {{ site.fontawesome.version }} using LESS or SASS.

  1. Copy the font-awesome/ directory into your project.
  2. - Open your project's font-awesome/variables.less and edit the @fa-font-path or $fa-font-path + Open your project's font-awesome/less/variables.less or font-awesome/scss/_variables.scss and edit the @fa-font-path or $fa-font-path variable to point to your font directory. {% highlight scss %} @fa-font-path: "../font"; {% endhighlight %}

    The font path is relative from your compiled CSS directory.

    3. -
  3. Re-compile your LESS or SCSS if using a static compiler. Otherwise, you should be good to go.
    4. +
  4. Re-compile your LESS or SASS if using a static compiler. Otherwise, you should be good to go.
  5. Check out the examples to start using Font Awesome!