Merge branch 'release/2.18.0'

* release/2.18.0:
  fix readme
  * Font Awesome 4.3.0 * Remove coveralls token

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.18.0
+
+* Font Awesome 4.3.0
+* Remove coveralls token
+
 ## 2.17.1
 
 * Update coveralls badge

README.md

@@ -142,7 +142,7 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
 
 ## Copyright and license
 
-Copyright 2014 diowa under [the BSD 2-Clause license](LICENSE).
+Copyright 2015 diowa under [the BSD 2-Clause license](LICENSE).
 
 Twitter Bootstrap is licensed under the MIT License
 

lib/twbs_less_rails/version.rb

@@ -1,3 +1,3 @@
 module TwbsLessRails
-  VERSION = "2.17.1"
+  VERSION = "2.18.0"
 end

test/integration/twbs_less_rails_integration_test.rb

@@ -27,6 +27,7 @@
     visit '/assets/fontawesome-webfont.svg'
     visit '/assets/fontawesome-webfont.ttf'
     visit '/assets/fontawesome-webfont.woff'
+    visit '/assets/fontawesome-webfont.woff2'
   end
 
   it "provides Glyphicons on the asset pipeline" do

twbs_less_rails.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency 'appraisal', '~> 1.0'
   s.add_development_dependency 'capybara', '~> 2.4'
-  s.add_development_dependency 'coveralls', '~> 0.7.1'
+  s.add_development_dependency 'coveralls', '~> 0.7.3'
   s.add_development_dependency 'minitest', '>= 4.7.5', '< 6.0.0'
   s.add_development_dependency 'rake', '~> 10.4'
   s.add_development_dependency 'simplecov', '~> 0.9.1'

vendor/assets/stylesheets/fontawesome/spinning.less → vendor/assets/stylesheets/fontawesome/animated.less

@@ -1,11 +1,16 @@
-// Spinning Icons
+// Animated Icons
 // --------------------------
 
 .@{fa-css-prefix}-spin {
   -webkit-animation: fa-spin 2s infinite linear;
           animation: fa-spin 2s infinite linear;
 }
 
+.@{fa-css-prefix}-pulse {
+  -webkit-animation: fa-spin 1s infinite steps(8);
+          animation: fa-spin 1s infinite steps(8);
+}
+
 @-webkit-keyframes fa-spin {
   0% {
     -webkit-transform: rotate(0deg);

vendor/assets/stylesheets/fontawesome/core.less

@@ -3,9 +3,11 @@
 
 .@{fa-css-prefix} {
   display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration
   font-size: inherit; // can't have font-size inherit on line above, so need to override
   text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  transform: translate(0, 0); // ensures no half-pixel rendering in firefox
+
 }

vendor/assets/stylesheets/fontawesome/font-awesome.less

@@ -1,5 +1,5 @@
 /*!
- *  Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome
+ *  Font Awesome 4.3.0 by @davegandy - http://fontawesome.io - @fontawesome
  *  License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License)
  */
 
@@ -11,7 +11,7 @@
 @import "fixed-width.less";
 @import "list.less";
 @import "bordered-pulled.less";
-@import "spinning.less";
+@import "animated.less";
 @import "rotated-flipped.less";
 @import "stacked.less";
 @import "icons.less";

vendor/assets/stylesheets/fontawesome/icons.less

@@ -158,6 +158,7 @@
 .@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; }
 .@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; }
 .@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; }
+.@{fa-css-prefix}-facebook-f:before,
 .@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; }
 .@{fa-css-prefix}-github:before { content: @fa-var-github; }
 .@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; }
@@ -397,7 +398,8 @@
 .@{fa-css-prefix}-trello:before { content: @fa-var-trello; }
 .@{fa-css-prefix}-female:before { content: @fa-var-female; }
 .@{fa-css-prefix}-male:before { content: @fa-var-male; }
-.@{fa-css-prefix}-gittip:before { content: @fa-var-gittip; }
+.@{fa-css-prefix}-gittip:before,
+.@{fa-css-prefix}-gratipay:before { content: @fa-var-gratipay; }
 .@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; }
 .@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; }
 .@{fa-css-prefix}-archive:before { content: @fa-var-archive; }
@@ -500,6 +502,7 @@
 .@{fa-css-prefix}-send-o:before,
 .@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; }
 .@{fa-css-prefix}-history:before { content: @fa-var-history; }
+.@{fa-css-prefix}-genderless:before,
 .@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; }
 .@{fa-css-prefix}-header:before { content: @fa-var-header; }
 .@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; }
@@ -550,3 +553,44 @@
 .@{fa-css-prefix}-sheqel:before,
 .@{fa-css-prefix}-ils:before { content: @fa-var-ils; }
 .@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; }
+.@{fa-css-prefix}-buysellads:before { content: @fa-var-buysellads; }
+.@{fa-css-prefix}-connectdevelop:before { content: @fa-var-connectdevelop; }
+.@{fa-css-prefix}-dashcube:before { content: @fa-var-dashcube; }
+.@{fa-css-prefix}-forumbee:before { content: @fa-var-forumbee; }
+.@{fa-css-prefix}-leanpub:before { content: @fa-var-leanpub; }
+.@{fa-css-prefix}-sellsy:before { content: @fa-var-sellsy; }
+.@{fa-css-prefix}-shirtsinbulk:before { content: @fa-var-shirtsinbulk; }
+.@{fa-css-prefix}-simplybuilt:before { content: @fa-var-simplybuilt; }
+.@{fa-css-prefix}-skyatlas:before { content: @fa-var-skyatlas; }
+.@{fa-css-prefix}-cart-plus:before { content: @fa-var-cart-plus; }
+.@{fa-css-prefix}-cart-arrow-down:before { content: @fa-var-cart-arrow-down; }
+.@{fa-css-prefix}-diamond:before { content: @fa-var-diamond; }
+.@{fa-css-prefix}-ship:before { content: @fa-var-ship; }
+.@{fa-css-prefix}-user-secret:before { content: @fa-var-user-secret; }
+.@{fa-css-prefix}-motorcycle:before { content: @fa-var-motorcycle; }
+.@{fa-css-prefix}-street-view:before { content: @fa-var-street-view; }
+.@{fa-css-prefix}-heartbeat:before { content: @fa-var-heartbeat; }
+.@{fa-css-prefix}-venus:before { content: @fa-var-venus; }
+.@{fa-css-prefix}-mars:before { content: @fa-var-mars; }
+.@{fa-css-prefix}-mercury:before { content: @fa-var-mercury; }
+.@{fa-css-prefix}-transgender:before { content: @fa-var-transgender; }
+.@{fa-css-prefix}-transgender-alt:before { content: @fa-var-transgender-alt; }
+.@{fa-css-prefix}-venus-double:before { content: @fa-var-venus-double; }
+.@{fa-css-prefix}-mars-double:before { content: @fa-var-mars-double; }
+.@{fa-css-prefix}-venus-mars:before { content: @fa-var-venus-mars; }
+.@{fa-css-prefix}-mars-stroke:before { content: @fa-var-mars-stroke; }
+.@{fa-css-prefix}-mars-stroke-v:before { content: @fa-var-mars-stroke-v; }
+.@{fa-css-prefix}-mars-stroke-h:before { content: @fa-var-mars-stroke-h; }
+.@{fa-css-prefix}-neuter:before { content: @fa-var-neuter; }
+.@{fa-css-prefix}-facebook-official:before { content: @fa-var-facebook-official; }
+.@{fa-css-prefix}-pinterest-p:before { content: @fa-var-pinterest-p; }
+.@{fa-css-prefix}-whatsapp:before { content: @fa-var-whatsapp; }
+.@{fa-css-prefix}-server:before { content: @fa-var-server; }
+.@{fa-css-prefix}-user-plus:before { content: @fa-var-user-plus; }
+.@{fa-css-prefix}-user-times:before { content: @fa-var-user-times; }
+.@{fa-css-prefix}-hotel:before,
+.@{fa-css-prefix}-bed:before { content: @fa-var-bed; }
+.@{fa-css-prefix}-viacoin:before { content: @fa-var-viacoin; }
+.@{fa-css-prefix}-train:before { content: @fa-var-train; }
+.@{fa-css-prefix}-subway:before { content: @fa-var-subway; }
+.@{fa-css-prefix}-medium:before { content: @fa-var-medium; }

vendor/assets/stylesheets/fontawesome/mixins.less

@@ -3,11 +3,13 @@
 
 .fa-icon() {
   display: inline-block;
-  font: normal normal normal 14px/1 FontAwesome; // shortening font declaration
+  font: normal normal normal @fa-font-size-base/1 FontAwesome; // shortening font declaration
   font-size: inherit; // can't have font-size inherit on line above, so need to override
   text-rendering: auto; // optimizelegibility throws things off #1094
   -webkit-font-smoothing: antialiased;
   -moz-osx-font-smoothing: grayscale;
+  transform: translate(0, 0); // ensures no half-pixel rendering in firefox
+
 }
 
 .fa-icon-rotate(@degrees, @rotation) {

vendor/assets/stylesheets/fontawesome/path.less

@@ -5,6 +5,7 @@
   font-family: 'FontAwesome';
   src: font-url('fontawesome-webfont.eot');
   src: font-url('fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
+    font-url('fontawesome-webfont.woff2') format('woff2'),
     font-url('fontawesome-webfont.woff') format('woff'),
     font-url('fontawesome-webfont.ttf') format('truetype'),
     font-url('fontawesome-webfont.svg#fontawesomeregular') format('svg');