Updated gems

Fontawesome 3.1.1
Updated CHANGELOG

CHANGELOG.md

@@ -3,6 +3,7 @@ Changelog
 
 0.3.0
 -----
+* Fontawesome 3.1.1
 
 0.2.0
 -----

Gemfile

@@ -42,7 +42,7 @@ gem 'less-rails'
 gem 'sass-rails', '~> 4.0.0.rc1'
 gem 'therubyracer'
 gem 'turbolinks'
-gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'rails4-assets'
+gem 'twitter-bootstrap-rails', github: 'diowa/twitter-bootstrap-rails', branch: 'fontawesome-3.1.1'
 gem 'uglifier', '>= 1.3.0'
 
 group :development, :test do

Gemfile.lock

@@ -7,8 +7,8 @@ GIT
 
 GIT
   remote: git://github.com/diowa/twitter-bootstrap-rails.git
-  revision: 9f1a1cbfed8b2e79d75d0e5d58b4ce9588e389ae
+  revision: c0f5b77b917e7ff91978b49ff559671e4861888f
-  branch: rails4-assets
+  branch: fontawesome-3.1.1
   specs:
     twitter-bootstrap-rails (2.2.6)
       actionpack (>= 3.1)
@@ -141,7 +141,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    meta_request (0.2.4)
+    meta_request (0.2.5)
       callsite
       rack-contrib
       railties
@@ -153,11 +153,11 @@ GEM
     nokogiri (1.5.9)
     pg (0.15.1)
     polyglot (0.3.3)
-    pry (0.9.12.1)
+    pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
       slop (~> 3.4)
-    pry-rails (0.2.2)
+    pry-rails (0.3.0)
       pry (>= 0.9.10)
     rack (1.5.2)
     rack-contrib (1.1.0)
@@ -209,7 +209,7 @@ GEM
       rspec-expectations (~> 2.13.0)
       rspec-mocks (~> 2.13.0)
     rubyzip (0.9.9)
-    sass (3.2.8)
+    sass (3.2.9)
     sass-rails (4.0.0.rc1)
       railties (>= 4.0.0.beta, < 5.0)
       sass (>= 3.1.10)
@@ -249,14 +249,14 @@ GEM
     thor (0.18.1)
     thread_safe (0.1.0)
       atomic
-    tilt (1.4.0)
+    tilt (1.4.1)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     turbolinks (1.1.1)
       coffee-rails
     tzinfo (0.3.37)
-    uglifier (2.0.1)
+    uglifier (2.1.0)
       execjs (>= 0.3.0)
       multi_json (~> 1.0, >= 1.0.2)
     unicorn (4.6.2)

app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -13,11 +13,12 @@ body {
 /* Fontawesome Icons
    ========================================================================== */
 
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot?v=3.0.2");
+@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot?#iefix&v=3.0.2");
+@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff?v=3.0.2");
+@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf?v=3.0.2");
+@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
-@import "fontawesome";
+@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
+@import "fontawesome/font-awesome";
 
 /* Overriding default variables and loading new ones
    ========================================================================== */

app/views/pages/home.html.haml

@@ -1,4 +1,7 @@
 - title t('hello')
-%h1
+%h1= t('hello')
-  %i.icon-globe
+%h2
-  = t('hello')
+  %i.icon-smile
+  Smile!
+  %p.lead.muted
+    Rails 4 + Ruby 2 + Font Awesome 3.1.1