twitter-bootstrap-rails 2.2.0 → 2.2.1

data/README.md

@@ -164,6 +164,17 @@ styles inheriting Bootstrap's mixins, you can do so inside bootstrap_and_overrid
 @linkColor: #ff0000;
 ```
 
+### Icons
+
+By default, this gem overrides standard Bootstraps's Glyphicons with Font Awesome (http://fortawesome.github.com/Font-Awesome/).
+If you would like to restore the default Glyphicons, inside the _bootstrap_and_overrides.css.less_ remove the FontAwesome declaration and uncomment the line:
+
+```css
+// Font Awesome
+// @import "fontawesome";
+// Glyphicons
+@import "twitter/bootstrap/sprites.less";
+```
 
 ## Using Javascripts
 
@@ -207,9 +218,12 @@ jQuery ->
 ## Using Helpers
 
 ### Flash helper
-Add flash helper <%= bootstrap_flash %> to your layout (built-in with layout generator)
+Add flash helper `<%= bootstrap_flash %>` to your layout (built-in with layout generator)
 
 ### Breadcrumbs Helpers
+
+Add breadcrumbs helper `<%= render_breadcrumbs %>` to your layout.
+
 ```ruby
 class ApplicationController
   add_breadcrumb :index, :root_path
@@ -242,8 +256,8 @@ en:
       index: "Examples"
       show: "Example"
 ```
-
-Add breadcrumbs helper <%= render_breadcrumbs %> to your layout
+NOTE: If you are using Devise in your project, you must have a devise locale file
+for handling flash messages, even if those messages are blank. See https://github.com/plataformatec/devise/wiki/I18n
 
 ## Changelog
 <ul>
@@ -290,6 +304,7 @@ Add breadcrumbs helper <%= render_breadcrumbs %> to your layout
   <li>Released gem v.2.1.8 and updated to Twitter Bootstrap 2.2.2</li>
   <li>Released gem v.2.1.9</li>
   <li>Released gem v.2.2.0 (Font Awesome 3)</li>
+  <li>Released gem v.2.2.1 (minor fixes and updates)</li>
 </ul>
 
 

data/app/helpers/bootstrap_flash_helper.rb

@@ -1,17 +1,16 @@
-module BootstrapFlashHelper  
+module BootstrapFlashHelper
   def bootstrap_flash
-   flash_messages = []
-   flash.each do |type, message|
-     # Skip Devise :timeout and :timedout flags
-     next if type == :timeout
-     next if type == :timedout
-     type = :success if type == :notice
-     type = :error   if type == :alert
-     text = content_tag(:div, 
-              content_tag(:button, raw("×"), :class => "close", "data-dismiss" => "alert") +
-              message, :class => "alert fade in alert-#{type}")
-     flash_messages << text if message
-   end
-   flash_messages.join("\n").html_safe
- end
-end
+    flash_messages = []
+    flash.each do |type, message|
+      # Skip empty messages, e.g. for devise messages set to nothing in a locale file.
+      next if message.blank?
+      type = :success if type == :notice
+      type = :error   if type == :alert
+      text = content_tag(:div,
+               content_tag(:button, raw("&times;"), :class => "close", "data-dismiss" => "alert") +
+               message, :class => "alert fade in alert-#{type}")
+      flash_messages << text if message
+    end
+    flash_messages.join("\n").html_safe
+  end
+end

data/lib/generators/bootstrap/install/install_generator.rb

@@ -44,6 +44,15 @@ module Bootstrap
         end
       end
 
+      def add_locale
+        if File.exist?("config/locales/en.bootstrap.yml")
+          localez = File.read("config/locales/en.bootstrap.yml")
+          insert_into_file "config/locales/en.bootstrap.yml", localez, :after => "en\n"
+        else
+          copy_file "en.bootstrap.yml", "config/locales/en.bootstrap.yml"
+        end
+      end
+
       def cleanup_legacy
         # Remove old requires (if any) that included twitter/bootstrap directly:
         gsub_file("app/assets/stylesheets/application.css", %r|\s*\*=\s*twitter/bootstrap\s*\n|, "")

data/lib/generators/bootstrap/install/templates/bootstrap_and_overrides.less

@@ -2,17 +2,16 @@
 @import "twitter/bootstrap/responsive";
 
 // Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
+@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings.png");
+@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white.png");
 
 // Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
 // Note: If you use asset_path() here, your compiled bootstrap_and_overrides.css will not
 //       have the proper paths. So for now we use the absolute path.
-@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-path("fontawesome-webfont.svg");
+@fontAwesomeEotPath: asset-path("fontawesome-webfont.eot?v=3.0.2");
+@fontAwesomeEotPath_iefix: asset-path("fontawesome-webfont.eot?#iefix&v=3.0.2");
+@fontAwesomeWoffPath: asset-path("fontawesome-webfont.woff?v=3.0.2");
+@fontAwesomeTtfPath: asset-path("fontawesome-webfont.ttf?v=3.0.2");
 
 // Font Awesome
 @import "fontawesome";

data/lib/generators/bootstrap/install/templates/en.bootstrap.yml

@@ -0,0 +1,17 @@
+# Sample localization file for English. Add more files in this directory for other locales.
+# See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
+
+en:
+  helpers:
+    actions: "Actions"
+    links:
+      back: "Back"
+      cancel: "Cancel"
+      confirm: "Confirm"
+      destroy: "Delete"
+      new: "New"
+    titles:
+      edit: "Edit"
+      save: "Save"
+      new: "New"
+      delete: "Delete"

data/lib/generators/bootstrap/layout/templates/layout.html.erb

@@ -95,7 +95,7 @@
       <%- end -%>
 
       <footer>
-        <p>&copy; Company 2012</p>
+        <p>&copy; Company 2013</p>
       </footer>
 
     </div> <!-- /container -->

data/lib/generators/bootstrap/layout/templates/layout.html.haml

@@ -61,7 +61,7 @@
               %li= link_to "Link 3", "/path3"
     <% end %>
       %footer
-        %p &copy; Company 2012
+        %p &copy; Company 2013
     /
       Javascripts
       \==================================================

data/lib/generators/bootstrap/layout/templates/layout.html.slim

@@ -61,7 +61,7 @@ html lang="en"
               li= link_to "Link 3", "/path3"
     <% end %>
       footer
-        p &copy; Company 2012
+        p &copy; Company 2013
     /!
       Javascripts
       \==================================================

data/lib/twitter/bootstrap/rails/version.rb

@@ -1,7 +1,7 @@
 module Twitter
   module Bootstrap
     module Rails
-      VERSION = "2.2.0"
+      VERSION = "2.2.1"
     end
   end
 end

data/vendor/assets/stylesheets/twitter-bootstrap-static/fontawesome.css.erb

@@ -1,9 +1,12 @@
-@font-face{font-family:"FontAwesome";src:url("<%= asset_path 'fontawesome-webfont.eot' %>");src:url("<%= asset_path 'fontawesome-webfont.eot#iefix' %>") format("embedded-opentype"),url("<%= asset_path 'fontawesome-webfont.woff' %>") format("woff"),url("<%= asset_path 'fontawesome-webfont.ttf' %>") format("truetype"),url("<%= asset_path 'fontawesome-webfont.svg' %>") format("svg");font-weight:normal;font-style:normal;}[class^="icon-"],[class*=" icon-"]{font-family:FontAwesome;font-weight:normal;font-style:normal;text-decoration:inherit;display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none !important;background-position:0% 0%;background-repeat:repeat;}
+@font-face{font-family:"FontAwesome";src:url("<%= asset_path 'fontawesome-webfont.eot?v=3.0.2' %>");src:url("<%= asset_path 'fontawesome-webfont.eot?#iefix&v=3.0.2' %>") format("embedded-opentype"),url("<%= asset_path 'fontawesome-webfont.woff?v=3.0.2' %>") format("woff"),url("<%= asset_path 'fontawesome-webfont.ttf?v=3.0.2' %>") format("truetype");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;display:inline;width:auto;height:auto;line-height:normal;vertical-align:baseline;background-image:none;background-position:0% 0%;background-repeat:repeat;margin-top:0;}
+.icon-white,.nav-pills>.active>a>[class^="icon-"],.nav-pills>.active>a>[class*=" icon-"],.nav-list>.active>a>[class^="icon-"],.nav-list>.active>a>[class*=" icon-"],.navbar-inverse .nav>.active>a>[class^="icon-"],.navbar-inverse .nav>.active>a>[class*=" icon-"],.dropdown-menu>li>a:hover>[class^="icon-"],.dropdown-menu>li>a:hover>[class*=" icon-"],.dropdown-menu>.active>a>[class^="icon-"],.dropdown-menu>.active>a>[class*=" icon-"],.dropdown-submenu:hover>a>[class^="icon-"],.dropdown-submenu:hover>a>[class*=" icon-"]{background-image:none;}
 [class^="icon-"]:before,[class*=" icon-"]:before{text-decoration:inherit;display:inline-block;speak:none;}
 a [class^="icon-"],a [class*=" icon-"]{display:inline-block;}
 .icon-large:before{vertical-align:-10%;font-size:1.3333333333333333em;}
-.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{display:inline;line-height:.6em;}.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;}
-li [class^="icon-"],li [class*=" icon-"]{display:inline-block;width:1.25em;text-align:center;}li [class^="icon-"].icon-large,li [class*=" icon-"].icon-large{width:1.5625em;}
+.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{display:inline;}.btn [class^="icon-"].icon-large,.nav [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large,.nav [class*=" icon-"].icon-large{line-height:.9em;}
+.btn [class^="icon-"].icon-spin,.nav [class^="icon-"].icon-spin,.btn [class*=" icon-"].icon-spin,.nav [class*=" icon-"].icon-spin{display:inline-block;}
+.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"]{}.nav-tabs [class^="icon-"],.nav-pills [class^="icon-"],.nav-tabs [class*=" icon-"],.nav-pills [class*=" icon-"],.nav-tabs [class^="icon-"].icon-large,.nav-pills [class^="icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large{line-height:.9em;}
+li [class^="icon-"],.nav li [class^="icon-"],li [class*=" icon-"],.nav li [class*=" icon-"]{display:inline-block;width:1.25em;text-align:center;}li [class^="icon-"].icon-large,.nav li [class^="icon-"].icon-large,li [class*=" icon-"].icon-large,.nav li [class*=" icon-"].icon-large{width:1.5625em;}
 ul.icons{list-style-type:none;text-indent:-0.75em;}ul.icons li [class^="icon-"],ul.icons li [class*=" icon-"]{width:.75em;}
 .icon-muted{color:#eeeeee;}
 .icon-border{border:solid 1px #eeeeee;padding:.2em .25em .15em;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
@@ -12,14 +15,16 @@ ul.icons{list-style-type:none;text-indent:-0.75em;}ul.icons li [class^="icon-"],
 .icon-4x{font-size:4em;}.icon-4x.icon-border{border-width:4px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
 .pull-right{float:right;}
 .pull-left{float:left;}
-[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.35em;}
-[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.35em;}
-.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.35em;}
-.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{height:.75em;}
-.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.45em;}
-.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.2em;}
+[class^="icon-"].pull-left,[class*=" icon-"].pull-left{margin-right:.3em;}
+[class^="icon-"].pull-right,[class*=" icon-"].pull-right{margin-left:.3em;}
+.btn [class^="icon-"].pull-left.icon-2x,.btn [class*=" icon-"].pull-left.icon-2x,.btn [class^="icon-"].pull-right.icon-2x,.btn [class*=" icon-"].pull-right.icon-2x{margin-top:.18em;}
+.btn [class^="icon-"].icon-spin.icon-large,.btn [class*=" icon-"].icon-spin.icon-large{line-height:.8em;}
+.btn.btn-small [class^="icon-"].pull-left.icon-2x,.btn.btn-small [class*=" icon-"].pull-left.icon-2x,.btn.btn-small [class^="icon-"].pull-right.icon-2x,.btn.btn-small [class*=" icon-"].pull-right.icon-2x{margin-top:.25em;}
+.btn.btn-large [class^="icon-"],.btn.btn-large [class*=" icon-"]{margin-top:0;}.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x,.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-top:.05em;}
+.btn.btn-large [class^="icon-"].pull-left.icon-2x,.btn.btn-large [class*=" icon-"].pull-left.icon-2x{margin-right:.2em;}
+.btn.btn-large [class^="icon-"].pull-right.icon-2x,.btn.btn-large [class*=" icon-"].pull-right.icon-2x{margin-left:.2em;}
 .icon-spin{display:inline-block;-moz-animation:spin 2s infinite linear;-o-animation:spin 2s infinite linear;-webkit-animation:spin 2s infinite linear;animation:spin 2s infinite linear;}
-@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}.icon-glass:before{content:"\f000";}
+@-moz-keyframes spin{0%{-moz-transform:rotate(0deg);} 100%{-moz-transform:rotate(359deg);}}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);} 100%{-webkit-transform:rotate(359deg);}}@-o-keyframes spin{0%{-o-transform:rotate(0deg);} 100%{-o-transform:rotate(359deg);}}@-ms-keyframes spin{0%{-ms-transform:rotate(0deg);} 100%{-ms-transform:rotate(359deg);}}@keyframes spin{0%{transform:rotate(0deg);} 100%{transform:rotate(359deg);}}@-moz-document url-prefix(){.icon-spin{height:.9em;} .btn .icon-spin{height:auto;} .icon-spin.icon-large{height:1.25em;} .btn .icon-spin.icon-large{height:.75em;}}.icon-glass:before{content:"\f000";}
 .icon-music:before{content:"\f001";}
 .icon-search:before{content:"\f002";}
 .icon-envelope:before{content:"\f003";}
@@ -268,9 +273,11 @@ ul.icons{list-style-type:none;text-indent:-0.75em;}ul.icons li [class^="icon-"],
 .icon-github-alt:before{content:"\f113";}
 .icon-folder-close-alt:before{content:"\f114";}
 .icon-folder-open-alt:before{content:"\f115";}
-[class^="icon-"],[class*=" icon-"]{padding-right:.3em;}
-.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:-20%;}
-.btn [class^="icon-"],.nav [class^="icon-"],.btn [class*=" icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;line-height:.9em;}
+.icon-large{font-size:1.3333333333333333em;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;vertical-align:middle;}
+.nav [class^="icon-"],.nav [class*=" icon-"]{vertical-align:inherit;margin-top:-4px;padding-top:3px;margin-bottom:-4px;padding-bottom:3px;}.nav [class^="icon-"].icon-large,.nav [class*=" icon-"].icon-large{vertical-align:-25%;}
+.nav-pills [class^="icon-"].icon-large,.nav-tabs [class^="icon-"].icon-large,.nav-pills [class*=" icon-"].icon-large,.nav-tabs [class*=" icon-"].icon-large{line-height:.75em;margin-top:-7px;padding-top:5px;margin-bottom:-5px;padding-bottom:4px;}
+.btn [class^="icon-"].pull-left,.btn [class*=" icon-"].pull-left,.btn [class^="icon-"].pull-right,.btn [class*=" icon-"].pull-right{vertical-align:inherit;}
+.btn [class^="icon-"].icon-large,.btn [class*=" icon-"].icon-large{margin-top:-0.5em;}
 a [class^="icon-"],a [class*=" icon-"]{cursor:pointer;}
 ul.icons{text-indent:-1.5em;margin-left:3em;}
 .icon-glass{*zoom:expression( this.runtimeStyle['zoom'] = '1', this.innerHTML = '&#xf000;');}

data/vendor/static-source/fontawesome.less

@@ -1,8 +1,7 @@
-@fontAwesomeEotPath: "<%= asset_path 'fontawesome-webfont.eot' %>";
-@fontAwesomeEotPath_iefix: "<%= asset_path 'fontawesome-webfont.eot#iefix' %>";
-@fontAwesomeWoffPath: "<%= asset_path 'fontawesome-webfont.woff' %>";
-@fontAwesomeTtfPath: "<%= asset_path 'fontawesome-webfont.ttf' %>";
-@fontAwesomeSvgPath: "<%= asset_path 'fontawesome-webfont.svg' %>";
+@fontAwesomeEotPath: "<%= asset_path 'fontawesome-webfont.eot?v=3.0.2' %>";
+@fontAwesomeEotPath_iefix: "<%= asset_path 'fontawesome-webfont.eot?#iefix&v=3.0.2' %>";
+@fontAwesomeWoffPath: "<%= asset_path 'fontawesome-webfont.woff?v=3.0.2' %>";
+@fontAwesomeTtfPath: "<%= asset_path 'fontawesome-webfont.ttf?v=3.0.2' %>";
 // Font Awesome
 @import "fontawesome";
 @import "fontawesome-ie7";

data/vendor/toolkit/fontawesome-ie7.less

@@ -1,30 +1,25 @@
-/*  Font Awesome 3.0
-    the iconic font designed for use with Twitter Bootstrap
-    -------------------------------------------------------
-    The full suite of pictographic icons, examples, and documentation
-    can be found at: http://fortawesome.github.com/Font-Awesome/
+/*!
+ *  Font Awesome 3.0.2
+ *  the iconic font designed for use with Twitter Bootstrap
+ *  -------------------------------------------------------
+ *  The full suite of pictographic icons, examples, and documentation
+ *  can be found at: http://fortawesome.github.com/Font-Awesome/
+ *
+ *  License
+ *  -------------------------------------------------------
+ *  - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+ *  - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+ *    http://opensource.org/licenses/mit-license.html
+ *  - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+ *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
+ *    "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
 
-    License
-    -------------------------------------------------------
-    • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
-    • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
-      http://opensource.org/licenses/mit-license.html
-    • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
-    • Attribution is no longer required in Font Awesome 3.0, but much appreciated:
-      "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
-
-    Contact
-    -------------------------------------------------------
-    Email: dave@davegandy.com
-    Twitter: http://twitter.com/fortaweso_me
-    Work: Lead Product Designer @ http://kyruus.com
-
-    */
-
-[class^="icon-"],
-[class*=" icon-"] {
-  padding-right:.3em;
-}
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 
 .icon-large {
   font-size: 4/3em;
@@ -32,10 +27,10 @@
   padding-top: 3px;
   margin-bottom: -4px;
   padding-bottom: 3px;
-  vertical-align: -20%;
+  vertical-align: middle;
 }
 
-.btn, .nav {
+.nav {
   [class^="icon-"],
   [class*=" icon-"] {
     vertical-align: inherit;
@@ -43,7 +38,32 @@
     padding-top: 3px;
     margin-bottom: -4px;
     padding-bottom: 3px;
-    line-height: .9em;
+    &.icon-large {
+      vertical-align: -25%;
+    }
+  }
+}
+
+.nav-pills, .nav-tabs {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.icon-large {
+      line-height: .75em;
+      margin-top: -7px;
+      padding-top: 5px;
+      margin-bottom: -5px;
+      padding-bottom: 4px;
+    }
+  }
+}
+
+.btn {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right { vertical-align: inherit; }
+    &.icon-large {
+      margin-top: -.5em;
+    }
   }
 }
 

data/vendor/toolkit/fontawesome.less

@@ -1,25 +1,25 @@
-/*  Font Awesome 3.0
-    the iconic font designed for use with Twitter Bootstrap
-    -------------------------------------------------------
-    The full suite of pictographic icons, examples, and documentation
-    can be found at: http://fortawesome.github.com/Font-Awesome/
-
-    License
-    -------------------------------------------------------
-    • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
-    • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
-      http://opensource.org/licenses/mit-license.html
-    • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
-    • Attribution is no longer required in Font Awesome 3.0, but much appreciated:
-      "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
-
-    Contact
-    -------------------------------------------------------
-    Email: dave@davegandy.com
-    Twitter: http://twitter.com/fortaweso_me
-    Work: Lead Product Designer @ http://kyruus.com
-
-    */
+/*!
+ *  Font Awesome 3.0.2
+ *  the iconic font designed for use with Twitter Bootstrap
+ *  -------------------------------------------------------
+ *  The full suite of pictographic icons, examples, and documentation
+ *  can be found at: http://fortawesome.github.com/Font-Awesome/
+ *
+ *  License
+ *  -------------------------------------------------------
+ *  - The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+ *  - Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+ *    http://opensource.org/licenses/mit-license.html
+ *  - The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+ *  - Attribution is no longer required in Font Awesome 3.0, but much appreciated:
+ *    "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
+
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 
 @borderColor:       #eee;
 @iconMuted:         #eee;
@@ -30,29 +30,48 @@
   src: url(@fontAwesomeEotPath);
   src: url(@fontAwesomeEotPath_iefix) format("embedded-opentype"),
     url(@fontAwesomeWoffPath) format("woff"),
-    url(@fontAwesomeTtfPath) format("truetype"),
-    url(@fontAwesomeSvgPath) format("svg");
+    url(@fontAwesomeTtfPath) format("truetype");
   font-weight: normal;
   font-style: normal;
 }
 
 /*  Font Awesome styles
     ------------------------------------------------------- */
-/* includes sprites.less reset */
 [class^="icon-"],
 [class*=" icon-"] {
   font-family: FontAwesome;
   font-weight: normal;
   font-style: normal;
   text-decoration: inherit;
+  -webkit-font-smoothing: antialiased;
+
+/* sprites.less reset */
   display: inline;
   width: auto;
   height: auto;
   line-height: normal;
   vertical-align: baseline;
-  background-image: none !important;
+  background-image: none;
   background-position: 0% 0%;
   background-repeat: repeat;
+  margin-top: 0;
+}
+
+/* more sprites.less reset */
+.icon-white,
+.nav-pills > .active > a > [class^="icon-"],
+.nav-pills > .active > a > [class*=" icon-"],
+.nav-list > .active > a > [class^="icon-"],
+.nav-list > .active > a > [class*=" icon-"],
+.navbar-inverse .nav > .active > a > [class^="icon-"],
+.navbar-inverse .nav > .active > a > [class*=" icon-"],
+.dropdown-menu > li > a:hover > [class^="icon-"],
+.dropdown-menu > li > a:hover > [class*=" icon-"],
+.dropdown-menu > .active > a > [class^="icon-"],
+.dropdown-menu > .active > a > [class*=" icon-"],
+.dropdown-submenu:hover > a > [class^="icon-"],
+.dropdown-submenu:hover > a > [class*=" icon-"] {
+  background-image: none;
 }
 
 [class^="icon-"]:before,
@@ -81,14 +100,20 @@ a {
   [class*=" icon-"] {
     display: inline;
     /* keeps button heights with and without icons the same */
-    line-height: .6em;
-    &.icon-spin {
-      display: inline-block;
-    }
+    &.icon-large { line-height: .9em; }
+    &.icon-spin { display: inline-block; }
+  }
+}
+
+.nav-tabs, .nav-pills {
+  [class^="icon-"],
+  [class*=" icon-"] {
+  /* keeps button heights with and without icons the same */
+    &, &.icon-large { line-height: .9em; }
   }
 }
 
-li {
+li, .nav li {
   [class^="icon-"],
   [class*=" icon-"] {
     display: inline-block;
@@ -161,10 +186,10 @@ ul.icons {
 [class^="icon-"],
 [class*=" icon-"] {
   &.pull-left {
-    margin-right: .35em;
+    margin-right: .3em;
   }
   &.pull-right {
-    margin-left: .35em;
+    margin-left: .3em;
   }
 }
 
@@ -172,9 +197,9 @@ ul.icons {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .35em; }
+      &.icon-2x { margin-top: .18em; }
     }
-    &.icon-spin.icon-large { height: .75em; }
+    &.icon-spin.icon-large { line-height: .8em; }
   }
 }
 
@@ -182,7 +207,7 @@ ul.icons {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .45em; }
+      &.icon-2x { margin-top: .25em; }
     }
   }
 }
@@ -190,9 +215,12 @@ ul.icons {
 .btn.btn-large {
   [class^="icon-"],
   [class*=" icon-"] {
+    margin-top: 0; // overrides bootstrap default
     &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .2em; }
+      &.icon-2x { margin-top: .05em; }
     }
+    &.pull-left.icon-2x { margin-right: .2em; }
+    &.pull-right.icon-2x { margin-left: .2em; }
   }
 }
 
@@ -226,6 +254,12 @@ ul.icons {
   100% { transform: rotate(359deg); }
 }
 
+@-moz-document url-prefix() {
+  .icon-spin { height: .9em; }
+  .btn .icon-spin { height: auto; }
+  .icon-spin.icon-large { height: 1.25em; }
+  .btn .icon-spin.icon-large { height: .75em; }
+}
 
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */