fixing numerous bugs

README.md

@@ -1,4 +1,4 @@
-#Font Awesome 3.0
+#Font Awesome 3.0.1
 ##the iconic font designed for use with Twitter Bootstrap
 
 The full suite of pictographic icons, examples, and documentation can be found at:

css/font-awesome.css

@@ -1,51 +1,70 @@
-/*  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.1
+ *  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
-
-    */
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/fontawesome-webfont.eot');
-  src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('../font/fontawesome-webfont.woff') format('woff'),
-    url('../font/fontawesome-webfont.ttf') format('truetype');
+  src: url('../font/fontawesome-webfont.eot?v=3.0.1');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
+    url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'),
+    url('../font/fontawesome-webfont.ttf?v=3.0.1') 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,
 [class*=" icon-"]:before {
@@ -70,7 +89,12 @@ a [class*=" icon-"] {
   display: inline;
   /* keeps button heights with and without icons the same */
 
-  line-height: .6em;
+}
+.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,
@@ -78,14 +102,35 @@ a [class*=" icon-"] {
 .nav [class*=" icon-"].icon-spin {
   display: inline-block;
 }
+.nav-tabs [class^="icon-"],
+.nav-pills [class^="icon-"],
+.nav-tabs [class*=" icon-"],
+.nav-pills [class*=" icon-"] {
+  /* keeps button heights with and without icons the same */
+
+}
+.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-"],
-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,
-li [class*=" icon-"].icon-large {
+.nav li [class^="icon-"].icon-large,
+li [class*=" icon-"].icon-large,
+.nav li [class*=" icon-"].icon-large {
   /* increased font size for icon-large */
 
   width: 1.5625em;
@@ -143,33 +188,45 @@ ul.icons li [class*=" icon-"] {
 }
 [class^="icon-"].pull-left,
 [class*=" icon-"].pull-left {
-  margin-right: .35em;
+  margin-right: .3em;
 }
 [class^="icon-"].pull-right,
 [class*=" icon-"].pull-right {
-  margin-left: .35em;
+  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: .35em;
+  margin-top: .18em;
 }
 .btn [class^="icon-"].icon-spin.icon-large,
 .btn [class*=" icon-"].icon-spin.icon-large {
-  height: .75em;
+  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: .45em;
+  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: .2em;
+  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;
@@ -198,6 +255,20 @@ ul.icons li [class*=" icon-"] {
   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;
+  }
+}
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */
 .icon-glass:before                { content: "\f000"; }

docs/assets/css/font-awesome.css

@@ -1,51 +1,70 @@
-/*  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.1
+ *  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
-
-    */
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 @font-face {
   font-family: 'FontAwesome';
-  src: url('../font/fontawesome-webfont.eot');
-  src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('../font/fontawesome-webfont.woff') format('woff'),
-    url('../font/fontawesome-webfont.ttf') format('truetype');
+  src: url('../font/fontawesome-webfont.eot?v=3.0.1');
+  src: url('../font/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
+    url('../font/fontawesome-webfont.woff?v=3.0.1') format('woff'),
+    url('../font/fontawesome-webfont.ttf?v=3.0.1') 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,
 [class*=" icon-"]:before {
@@ -70,7 +89,12 @@ a [class*=" icon-"] {
   display: inline;
   /* keeps button heights with and without icons the same */
 
-  line-height: .6em;
+}
+.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,
@@ -78,14 +102,35 @@ a [class*=" icon-"] {
 .nav [class*=" icon-"].icon-spin {
   display: inline-block;
 }
+.nav-tabs [class^="icon-"],
+.nav-pills [class^="icon-"],
+.nav-tabs [class*=" icon-"],
+.nav-pills [class*=" icon-"] {
+  /* keeps button heights with and without icons the same */
+
+}
+.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-"],
-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,
-li [class*=" icon-"].icon-large {
+.nav li [class^="icon-"].icon-large,
+li [class*=" icon-"].icon-large,
+.nav li [class*=" icon-"].icon-large {
   /* increased font size for icon-large */
 
   width: 1.5625em;
@@ -143,33 +188,45 @@ ul.icons li [class*=" icon-"] {
 }
 [class^="icon-"].pull-left,
 [class*=" icon-"].pull-left {
-  margin-right: .35em;
+  margin-right: .3em;
 }
 [class^="icon-"].pull-right,
 [class*=" icon-"].pull-right {
-  margin-left: .35em;
+  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: .35em;
+  margin-top: .18em;
 }
 .btn [class^="icon-"].icon-spin.icon-large,
 .btn [class*=" icon-"].icon-spin.icon-large {
-  height: .75em;
+  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: .45em;
+  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: .2em;
+  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;
@@ -198,6 +255,20 @@ ul.icons li [class*=" icon-"] {
   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;
+  }
+}
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */
 .icon-glass:before                { content: "\f000"; }

docs/assets/less/font-awesome-ie7.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/
+/*!
+ *  Font Awesome 3.0.1
+ *  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
-
-    */
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 
 [class^="icon-"],
 [class*=" icon-"] {

docs/assets/less/font-awesome.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.1
+ *  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
+ */
 
 @FontAwesomePath:   "../font";
 @borderColor:       #eee;
@@ -28,10 +28,11 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot');
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('@{FontAwesomePath}/fontawesome-webfont.woff') format('woff'),
-    url('@{FontAwesomePath}/fontawesome-webfont.ttf') format('truetype');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=3.0.1');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format('woff'),
+    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format('truetype');
+//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=3.0.1') format('svg');
 
 //  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype');
 
@@ -41,21 +42,41 @@
 
 /*  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,
@@ -84,14 +105,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;
@@ -164,10 +191,10 @@ ul.icons {
 [class^="icon-"],
 [class*=" icon-"] {
   &.pull-left {
-    margin-right: .35em;
+    margin-right: .3em;
   }
   &.pull-right {
-    margin-left: .35em;
+    margin-left: .3em;
   }
 }
 
@@ -175,9 +202,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; }
   }
 }
 
@@ -185,7 +212,7 @@ ul.icons {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .45em; }
+      &.icon-2x { margin-top: .25em; }
     }
   }
 }
@@ -193,9 +220,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; }
   }
 }
 
@@ -229,6 +259,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 */

docs/assets/less/twbs-222/bootstrap.less

@@ -27,7 +27,7 @@
 @import "tables.less";
 
 // Components: common
-//@import "sprites.less";
+@import "sprites.less";
 @import "dropdowns.less";
 @import "wells.less";
 @import "component-animations.less";

docs/index.html

@@ -22,7 +22,7 @@
 
   <link rel="stylesheet" href="assets/css/site.css">
   <link rel="stylesheet" href="assets/css/prettify.css">
-  <link rel="stylesheet" href="assets/css/font-awesome.min.css">
+  <link rel="stylesheet" href="assets/css/font-awesome.css">
   <!--[if IE 7]>
   <link rel="stylesheet" href="assets/css/font-awesome-ie7.min.css">
   <![endif]-->
@@ -58,12 +58,12 @@
             <li><a href="#icons-new">New Icons</a></li>
             <li class="divider"></li>
             <li class="nav-header">All Icons</li>
-            <li><a href="#icons-web-app">Web Application</a></li>
-            <li><a href="#icons-text-editor">Text Editor</a></li>
-            <li><a href="#icons-directional">Directional</a></li>
-            <li><a href="#icons-video-player">Video Player</a></li>
-            <li><a href="#icons-social">Social</a></li>
-            <li><a href="#icons-medical">Medical</a></li>
+            <li><a href="#icons-web-app"><i class="icon-edit"></i> Web Application</a></li>
+            <li><a href="#icons-text-editor"><i class="icon-save"></i> Text Editor</a></li>
+            <li><a href="#icons-directional"><i class="icon-hand-right"></i> Directional</a></li>
+            <li><a href="#icons-video-player"><i class="icon-play"></i> Video Player</a></li>
+            <li><a href="#icons-social"><i class="icon-github"></i> Social</a></li>
+            <li><a href="#icons-medical"><i class="icon-stethoscope"></i> Medical</a></li>
           </ul>
         </li>
         <li><a href="#integration">Integration</a></li>
@@ -98,7 +98,7 @@
             View Project<br>on GitHub</a>
         </div>
         <div class="shameless-self-promotion">
-          Version 3.0.0 • Created & Maintained by Dave Gandy
+          Version 3.0.1 • Created & Maintained by Dave Gandy
         </div>
       </div>
     </div>
@@ -211,7 +211,7 @@
     </div>
     <div class="span4">
       <h4><i class="icon-th-large"></i> <a target="_blank"  href="http://icnfnt.com/">Font Sub-setting</a></h4>
-      Thanks to <a target="_blank" href="https://twitter.com/grantgordon">@grantgordon</a> and <a target="_blank" href="https://twitter.com/johnsmclay">@johnsmclay</a>, you can <a target="_blank"  href="http://icnfnt.com/">sub-set</a> to get just the icons you need.
+      Thanks to <a target="_blank" href="https://twitter.com/grantgordon">@grantgordon</a> and <a target="_blank" href="https://twitter.com/johnsmclay">@johnsmclay</a>, you can <a target="_blank"  href="http://icnfnt.com/">subset</a> to get just the icons you need.
     </div>
     <div class="span4">
       <h4><i class="icon-legal"></i> <a href="#license">Better License</a></h4>
@@ -228,8 +228,8 @@
       <a href="#examples">New styles</a> for animated spinning icons, icons with 2x-4x size multipliers, icon borders, & more.
     </div>
     <div class="span4">
-      <h4><i class="icon-resize-small"></i> 21% Smaller Payload</h4>
-      3.0 is smaller, even with 16% more icons. Crazy small if you <a target="_blank"  href="http://icnfnt.com/">sub-set</a> just the icons you need.
+      <h4><i class="icon-resize-small"></i> 28% Smaller Payload</h4>
+      3.0 is smaller, even with 16% more icons. Crazy small if you <a target="_blank"  href="http://icnfnt.com/">subset</a> just the icons you need.
     </div>
   </div>
 </section>
@@ -998,7 +998,7 @@
 Use a few of the new styles together ... lots of new possibilities.
 </pre>
     <div class="well well-large well-transparent">
-      <i class="icon-camera-retro icon-4x pull-left icon-border"></i>
+      <i class="icon-flag icon-4x pull-left icon-border"></i>
       Use a few of the new styles together, and you've got easy pull quotes or a great introductory article image.
       Or spinning icons for loading and refreshing content. Or fun big icons in multi-line buttons. You can combine all
       of them in any combination to get lots of new possibilities.
@@ -1390,7 +1390,7 @@ Use a few of the new styles together ... lots of new possibilities.
         <p>
           Special thanks to <a target="_blank" href="https://twitter.com/grantgordon">@grantgordon</a> and
           <a target="_blank" href="https://twitter.com/johnsmclay">@johnsmclay</a> for developing
-          <a target="_blank"  href="http://icnfnt.com/">icnfnt</a>, the best way to sub-set Font Awesome to get just the
+          <a target="_blank"  href="http://icnfnt.com/">icnfnt</a>, the best way to subset Font Awesome to get just the
           icons you need.
         </p>
       </div>

docs/test.html

@@ -81,11 +81,22 @@
   </div>
 
 
-  <h3>Links with Icons <small>icon should activate link</small></h3>
+  <h3>Links with Icons <small>icon should activate link & underline</small></h3>
+  <div>
+    <a href="#"><i class="icon-building"></i> Link Here</a>
+    <a href="#"><i class="icon-building icon-large"></i> Link Here</a>
+    <a href="#"><i class="icon-caret-down"></i> Link Here</a>
+    <a href="#">Link Here <i class="icon-double-angle-right"></i></a>
+    <a href="#">Link Here <i class="icon-double-angle-right icon-large"></i></a>
+    <a href="#">Link Here <i class="icon-caret-down"></i></a>
+  </div>
   <div class="lead">
     <a href="#"><i class="icon-building"></i> Link Here</a>
     <a href="#"><i class="icon-building icon-large"></i> Link Here</a>
     <a href="#"><i class="icon-caret-down"></i> Link Here</a>
+    <a href="#">Link Here <i class="icon-double-angle-right"></i></a>
+    <a href="#">Link Here <i class="icon-double-angle-right icon-large"></i></a>
+    <a href="#">Link Here <i class="icon-caret-down"></i></a>
   </div>
 
 
@@ -107,6 +118,7 @@
             </ul>
           </li>
           <li style="border: solid 1px white;"><a href="#examples"><i class="icon-building icon-large"></i> Nav Item 3</a></li>
+          <li style="border: solid 1px white;"><a href="#examples"><i class="icon-envelope"></i> Nav Item 3</a></li>
         </ul>
       </div>
     </div>
@@ -166,6 +178,7 @@
     </div>
   </div>
 
+
   <h4>Anchors</h4>
   <div class="row">
     <div class="span6">
@@ -224,7 +237,7 @@
     <div class="span4">
       <div style="border: solid 1px #d3d3d3;">
         <a class="btn btn-large" href="#">
-          <i class="icon-building icon-2x pull-left"></i>
+          <i class="icon-github icon-2x pull-left"></i>
           Longer<br>Button</a>
         <a class="btn btn-large" href="#">
           Longer<br>Button</a>
@@ -233,7 +246,7 @@
     <div class="span4">
       <div style="border: solid 1px #d3d3d3;">
         <a class="btn" href="#">
-          <i class="icon-building icon-2x pull-left"></i>
+          <i class="icon-github icon-2x pull-left"></i>
           Longer<br>Button</a>
         <a class="btn" href="#">
           Longer<br>Button</a>
@@ -242,7 +255,7 @@
     <div class="span4">
       <div style="border: solid 1px #d3d3d3;">
         <a class="btn btn-small" href="#">
-          <i class="icon-building icon-2x pull-left"></i>
+          <i class="icon-github icon-2x pull-left"></i>
           Longer<br>Button</a>
         <a class="btn btn-small" href="#">
           Longer<br>Button</a>
@@ -250,43 +263,38 @@
     </div>
   </div>
 
+
   <h3>Nav pills & nav tabs <small>should be same height</small></h3>
-  <div class="row">
-    <span class="span6">
-      <ul class="nav nav-pills">
-        <li class="active"><a href="#">Nav Item 1</a></li>
-        <li class="dropdown active">
-          <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
-            Nav Item 2
-            <i class="icon-caret-down"></i>
-          </a>
-          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="icon-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="icon-building icon-large"></i> Menu Item 2</a></li>
-          </ul>
-        </li>
-        <li class="active"><a href="#examples"><i class="icon-building icon-large"></i> Nav Item 3</a></li>
-        <li class="active"><a href="#examples"><i class="icon-spinner icon-spin"></i> Nav Item 4</a></li>
+  <ul class="nav nav-pills" style="border: solid 1px #d3d3d3;">
+    <li class="active"><a href="#">Nav Item 1</a></li>
+    <li class="dropdown active">
+      <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+        Nav Item 2
+        <i class="icon-caret-down"></i>
+      </a>
+      <ul class="dropdown-menu" role="menu">
+        <li><a href="#"><i class="icon-building"></i> Menu Item 1</a></li>
+        <li><a href="#"><i class="icon-building icon-large"></i> Menu Item 2</a></li>
       </ul>
-    </span>
-    <span class="span6">
-      <ul class="nav nav-tabs">
-        <li class="active"><a href="#">Nav Item 1</a></li>
-        <li class="dropdown active">
-          <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
-            Nav Item 2
-            <i class="icon-caret-down"></i>
-          </a>
-          <ul class="dropdown-menu" role="menu">
-            <li><a href="#"><i class="icon-building"></i> Menu Item 1</a></li>
-            <li><a href="#"><i class="icon-building icon-large"></i> Menu Item 2</a></li>
-          </ul>
-        </li>
-        <li class="active"><a href="#examples"><i class="icon-building icon-large"></i> Nav Item 3</a></li>
-        <li class="active"><a href="#examples"><i class="icon-spinner icon-spin"></i> Nav Item 4</a></li>
+    </li>
+    <li class="active"><a href="#examples"><i class="icon-building icon-large"></i> Nav Item 3</a></li>
+    <li class="active"><a href="#examples"><i class="icon-spinner icon-spin"></i> Nav Item 4</a></li>
+  </ul>
+  <ul class="nav nav-tabs">
+    <li class="active"><a href="#">Nav Item 1</a></li>
+    <li class="dropdown active">
+      <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown">
+        Nav Item 2
+        <i class="icon-caret-down"></i>
+      </a>
+      <ul class="dropdown-menu" role="menu">
+        <li><a href="#"><i class="icon-building"></i> Menu Item 1</a></li>
+        <li><a href="#"><i class="icon-building icon-large"></i> Menu Item 2</a></li>
       </ul>
-    </span>
-  </div>
+    </li>
+    <li class="active"><a href="#examples"><i class="icon-building icon-large"></i> Nav Item 3</a></li>
+    <li class="active"><a href="#examples"><i class="icon-spinner icon-spin"></i> Nav Item 4</a></li>
+  </ul>
 
 
   <h3>2x, 3x, 4x icons in text <small>should have margins next to and below text</small></h3>
@@ -319,6 +327,7 @@
     </div>
   </div>
 
+
   <h3>Bullets <small>should wrap appropriately, have proper spacing</small></h3>
   <div class="row">
     <div class="span6">
@@ -337,6 +346,7 @@
     </div>
   </div>
 
+
   <h3>Spinning icons <small>icons should be aligned well and on center, buttons should be same height, won't work in ie7</small></h3>
   <div style="border: solid 1px #d3d3d3;">
     <i class="icon-refresh icon-spin"></i> Loading...

less/font-awesome-ie7.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/
+/*!
+ *  Font Awesome 3.0.1
+ *  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
-
-    */
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 
 [class^="icon-"],
 [class*=" icon-"] {

less/font-awesome.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.1
+ *  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
+ */
 
 @FontAwesomePath:   "../font";
 @borderColor:       #eee;
@@ -28,31 +28,55 @@
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot');
-  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
-    url('@{FontAwesomePath}/fontawesome-webfont.woff') format('woff'),
-    url('@{FontAwesomePath}/fontawesome-webfont.ttf') format('truetype');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?v=3.0.1');
+  src: url('@{FontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format('embedded-opentype'),
+    url('@{FontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format('woff'),
+    url('@{FontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format('truetype');
+//    url('@{FontAwesomePath}/fontawesome-webfont.svg#fontawesomeregular?v=3.0.1') format('svg');
+
+//  src: url('@{FontAwesomePath}/FontAwesome.otf') format('opentype');
+
   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 +105,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; }
   }
 }
 
-li {
+.nav-tabs, .nav-pills {
+  [class^="icon-"],
+  [class*=" icon-"] {
+  /* keeps button heights with and without icons the same */
+    &, &.icon-large { line-height: .9em; }
+  }
+}
+
+li, .nav li {
   [class^="icon-"],
   [class*=" icon-"] {
     display: inline-block;
@@ -161,10 +191,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 +202,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 +212,7 @@ ul.icons {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .45em; }
+      &.icon-2x { margin-top: .25em; }
     }
   }
 }
@@ -190,9 +220,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 +259,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 */

sass/font-awesome.sass

@@ -1,23 +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.1
+ *  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
+ *  Contact
+ *  -------------------------------------------------------
+ *  Email: dave@davegandy.com
+ *  Twitter: http://twitter.com/fortaweso_me
+ *  Work: Lead Product Designer @ http://kyruus.com
+ */
 
 $fontAwesomePath:   "../font" !default
 $borderColor:       #eee
@@ -30,57 +32,88 @@ $iconMuted:         #eee
 
 @font-face
   font-family: 'FontAwesome'
-  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot')
-  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"), url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"), url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype")
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?v=3.0.1')
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format("embedded-opentype"), url('#{$fontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format("woff"), url('#{$fontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') format("truetype")
   font-weight: normal
   font-style: normal
 
 
 /*  Font Awesome styles
  *  -------------------------------------------------------
-/* includes sprites.less reset
 
-[class^="icon-"], [class*=" icon-"]
+[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
-
-[class^="icon-"]:before, [class*=" icon-"]:before
+  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,
+[class*=" icon-"]:before
   text-decoration: inherit
   display: inline-block
   speak: none
 
-/* makes sure icons active on rollover in links
-
+/* makes sure icons active on rollover in links */
 a
-  [class^="icon-"], [class*=" icon-"]
+  [class^="icon-"],
+  [class*=" icon-"]
     display: inline-block
 
-/* makes the font 33% larger relative to the icon container
-
+/* makes the font 33% larger relative to the icon container */
 .icon-large:before
   vertical-align: -10%
-  font-size: 1.3333333333333333em
+  font-size: 4/3em
 
 .btn, .nav
-  [class^="icon-"], [class*=" icon-"]
+  [class^="icon-"],
+  [class*=" icon-"]
     display: inline
     /* keeps button heights with and without icons the same */
-    line-height: .6em
+    &.icon-large
+      line-height: .9em
     &.icon-spin
       display: inline-block
 
-li
-  [class^="icon-"], [class*=" icon-"]
+.nav-tabs, .nav-pills
+  [class^="icon-"],
+  [class*=" icon-"]
+    /* keeps button heights with and without icons the same */
+    line-height: .9em
+    &.icon-large
+      line-height: .9em
+
+li, .nav li
+  [class^="icon-"],
+  [class*=" icon-"]
     display: inline-block
     width: 1.25em
     text-align: center
@@ -91,9 +124,9 @@ li
 ul.icons
   list-style-type: none
   text-indent: -.75em
-
   li
-    [class^="icon-"], [class*=" icon-"]
+    [class^="icon-"],
+    [class*=" icon-"]
       width: .75em
 
 .icon-muted
@@ -134,35 +167,43 @@ ul.icons
 // Quick floats
 .pull-right
   float: right
-
 .pull-left
   float: left
 
-[class^="icon-"], [class*=" icon-"]
+[class^="icon-"],
+[class*=" icon-"]
   &.pull-left
-    margin-right: .35em
+    margin-right: .3em
   &.pull-right
-    margin-left: .35em
+    margin-left: .3em
 
 .btn
-  [class^="icon-"], [class*=" icon-"]
+  [class^="icon-"],
+  [class*=" icon-"]
     &.pull-left, &.pull-right
       &.icon-2x
-        margin-top: .35em
+        margin-top: .18em
     &.icon-spin.icon-large
-      height: .75em
+      line-height: .8em
 
 .btn.btn-small
-  [class^="icon-"], [class*=" icon-"]
+  [class^="icon-"],
+  [class*=" icon-"]
     &.pull-left, &.pull-right
       &.icon-2x
-        margin-top: .45em
+        margin-top: .25em
 
 .btn.btn-large
-  [class^="icon-"], [class*=" icon-"]
+  [class^="icon-"],
+  [class*=" icon-"]
+    margin-top: 0 // overrides bootstrap default
     &.pull-left, &.pull-right
       &.icon-2x
-        margin-top: .2em
+        margin-top: .05em
+    &.pull-left.icon-2x
+      margin-right: .2em
+    &.pull-right.icon-2x
+      margin-left: .2em
 
 
 .icon-spin
@@ -202,6 +243,16 @@ 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

sass/font-awesome.scss

@@ -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.1
+ *  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
+ */
 
 $fontAwesomePath:   "../font" !default;
 $borderColor:       #eee;
@@ -29,31 +29,51 @@ $iconMuted:         #eee;
 
 @font-face {
   font-family: 'FontAwesome';
-  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot');
-  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"),
-    url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"),
-    url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype");
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?v=3.0.1');
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix&v=3.0.1') format("embedded-opentype"),
+    url('#{$fontAwesomePath}/fontawesome-webfont.woff?v=3.0.1') format("woff"),
+    url('#{$fontAwesomePath}/fontawesome-webfont.ttf?v=3.0.1') 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,
@@ -74,7 +94,7 @@ a {
 /* makes the font 33% larger relative to the icon container */
 .icon-large:before {
   vertical-align: -10%;
-  font-size: 1.3333333333333333em;
+  font-size: 4/3em;
 }
 
 .btn, .nav {
@@ -82,14 +102,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; }
   }
 }
 
-li {
+.nav-tabs, .nav-pills {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    /* keeps button heights with and without icons the same */
+    &, &.icon-large { line-height: .9em; }
+  }
+}
+
+li, .nav li {
   [class^="icon-"],
   [class*=" icon-"] {
     display: inline-block;
@@ -162,10 +188,10 @@ ul.icons {
 [class^="icon-"],
 [class*=" icon-"] {
   &.pull-left {
-    margin-right: .35em;
+    margin-right: .3em;
   }
   &.pull-right {
-    margin-left: .35em;
+    margin-left: .3em;
   }
 }
 
@@ -173,9 +199,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; }
   }
 }
 
@@ -183,7 +209,7 @@ ul.icons {
   [class^="icon-"],
   [class*=" icon-"] {
     &.pull-left, &.pull-right {
-      &.icon-2x { margin-top: .45em; }
+      &.icon-2x { margin-top: .25em; }
     }
   }
 }
@@ -191,9 +217,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; }
   }
 }
 
@@ -227,6 +256,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 */