updating sass and scss files

docs/index.html

@@ -206,7 +206,7 @@
   <div class="row">
     <div class="span4">
       <h4><i class="icon-magic"></i> Pixel Perfection at 14px</h4>
-      Every icon re-created from the ground up to be optimized for Bootstrap's default 14px.
+      Every single icon re-created from the ground up to be optimized for Bootstrap's default 14px.
     </div>
     <div class="span4">
       <h4><i class="icon-th-large"></i> <a target="_blank"  href="http://icnfnt.com/">Font Sub-setting</a></h4>

sass/font-awesome.sass

@@ -1,4 +1,4 @@
-/*  Font Awesome
+/*  Font Awesome 3.0
  *    the iconic font designed for use with Twitter Bootstrap
  *    -------------------------------------------------------
  *    The full suite of pictographic icons, examples, and documentation
@@ -6,13 +6,12 @@
  *
  *    License
  *    -------------------------------------------------------
- *    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
+ *    • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
- *    http://creativecommons.org/licenses/by/3.0/ A mention of
+ *    • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
- *    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
+ *      http://opensource.org/licenses/mit-license.html
- *    source code is considered acceptable attribution (most common on the web).
+ *    • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
- *    If human readable source code is not available to the end user, a mention in
+ *    • Attribution is no longer required in Font Awesome 3.0, but much appreciated:
- *    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
+ *      "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
- *    or mobile software).
  *
  *    Contact
  *    -------------------------------------------------------
@@ -20,693 +19,689 @@
  *    Twitter: http://twitter.com/fortaweso_me
  *    Work: Lead Product Designer @ http://kyruus.com
 
-@import compass/css3/font-face
+$fontAwesomePath:   "../font" !default
+$borderColor:       #eee
+$iconMuted:         #eee
+@mixin border-radius($radius)
+  -webkit-border-radius: $radius
+  -moz-border-radius: $radius
+  border-radius: $radius
 
-$fontAwesomePath: "../font/fontawesome-webfont" !default
 
-+font-face("FontAwesome", font-files("#{$fontAwesomePath}.woff", woff, "#{$fontAwesomePath}.ttf", truetype, "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg), "#{$fontAwesomePath}.eot", normal, normal)
+@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")
+  font-weight: normal
+  font-style: normal
+
 
 /*  Font Awesome styles
  *  -------------------------------------------------------
+/* includes sprites.less reset
 
-[class^="icon-"]:before,
+[class^="icon-"], [class*=" icon-"]
-[class*=" icon-"]:before
   font-family: FontAwesome
   font-weight: normal
   font-style: normal
-  display: inline-block
   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
 
-a [class^="icon-"],
+[class^="icon-"]:before, [class*=" icon-"]:before
-a [class*=" icon-"]
-  display: inline-block
   text-decoration: inherit
+  display: inline-block
+  speak: none
+
+/* makes sure icons active on rollover in links
+
+a
+  [class^="icon-"], [class*=" icon-"]
+    display: inline-block
 
 /* makes the font 33% larger relative to the icon container
-.icon-large:before
-  vertical-align: middle
-  font-size: 4 / 3em
 
-.btn, .nav-tabs
+.icon-large:before
-  [class^="icon-"],
+  vertical-align: -10%
-  [class*=" icon-"]
+  font-size: 1.3333333333333333em
-    /* keeps button heights with and without icons the same
+
-    line-height: .9em
+.btn, .nav
+  [class^="icon-"], [class*=" icon-"]
+    display: inline
+    /* keeps button heights with and without icons the same */
+    line-height: .6em
+    &.icon-spin
+      display: inline-block
 
 li
-  [class^="icon-"],
+  [class^="icon-"], [class*=" icon-"]
-  [class*=" icon-"]
     display: inline-block
     width: 1.25em
     text-align: center
-  .icon-large:before,
+    &.icon-large
-  .icon-large:before
+      /* increased font size for icon-large */
-    /* 1.5 increased font size for icon-large * 1.25 width
+      width: 1.25*1.25em
-    width: 1.5 * 1.25em
 
 ul.icons
   list-style-type: none
-  margin-left: 2em
+  text-indent: -.75em
-  text-indent: -0.8em
+
   li
-    [class^="icon-"],
+    [class^="icon-"], [class*=" icon-"]
-    [class*=" icon-"]
+      width: .75em
-      width: .8em
+
-    .icon-large:before,
+.icon-muted
-    .icon-large:before
+  color: $iconMuted
-      /* 1.5 increased font size for icon-large * 1.25 width
+
-      vertical-align: initial
+// Icon Borders
-      //      width: 1.5*1.25em;
+// -------------------------
+
+.icon-border
+  border: solid 1px $borderColor
+  padding: .2em .25em .15em
+  @include border-radius(3px)
+
+// Icon Sizes
+// -------------------------
+
+.icon-2x
+  font-size: 2em
+  &.icon-border
+    border-width: 2px
+    @include border-radius(4px)
+
+.icon-3x
+  font-size: 3em
+  &.icon-border
+    border-width: 3px
+    @include border-radius(5px)
+
+.icon-4x
+  font-size: 4em
+  &.icon-border
+    border-width: 4px
+    @include border-radius(6px)
+
+// Floats
+// -------------------------
+
+// Quick floats
+.pull-right
+  float: right
+
+.pull-left
+  float: left
+
+[class^="icon-"], [class*=" icon-"]
+  &.pull-left
+    margin-right: .35em
+  &.pull-right
+    margin-left: .35em
+
+.btn
+  [class^="icon-"], [class*=" icon-"]
+    &.pull-left, &.pull-right
+      &.icon-2x
+        margin-top: .35em
+    &.icon-spin.icon-large
+      height: .75em
+
+.btn.btn-small
+  [class^="icon-"], [class*=" icon-"]
+    &.pull-left, &.pull-right
+      &.icon-2x
+        margin-top: .45em
+
+.btn.btn-large
+  [class^="icon-"], [class*=" icon-"]
+    &.pull-left, &.pull-right
+      &.icon-2x
+        margin-top: .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)
+
 
 /*  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"
-
 .icon-music:before
   content: "\f001"
-
 .icon-search:before
   content: "\f002"
-
 .icon-envelope:before
   content: "\f003"
-
 .icon-heart:before
   content: "\f004"
-
 .icon-star:before
   content: "\f005"
-
 .icon-star-empty:before
   content: "\f006"
-
 .icon-user:before
   content: "\f007"
-
 .icon-film:before
   content: "\f008"
-
 .icon-th-large:before
   content: "\f009"
-
 .icon-th:before
   content: "\f00a"
-
 .icon-th-list:before
   content: "\f00b"
-
 .icon-ok:before
   content: "\f00c"
-
 .icon-remove:before
   content: "\f00d"
-
 .icon-zoom-in:before
   content: "\f00e"
-
 .icon-zoom-out:before
   content: "\f010"
-
 .icon-off:before
   content: "\f011"
-
 .icon-signal:before
   content: "\f012"
-
 .icon-cog:before
   content: "\f013"
-
 .icon-trash:before
   content: "\f014"
-
 .icon-home:before
   content: "\f015"
-
 .icon-file:before
   content: "\f016"
-
 .icon-time:before
   content: "\f017"
-
 .icon-road:before
   content: "\f018"
-
 .icon-download-alt:before
   content: "\f019"
-
 .icon-download:before
   content: "\f01a"
-
 .icon-upload:before
   content: "\f01b"
-
 .icon-inbox:before
   content: "\f01c"
-
 .icon-play-circle:before
   content: "\f01d"
-
 .icon-repeat:before
   content: "\f01e"
-
 /* \f020 doesn't work in Safari. all shifted one down
 .icon-refresh:before
   content: "\f021"
-
 .icon-list-alt:before
   content: "\f022"
-
 .icon-lock:before
   content: "\f023"
-
 .icon-flag:before
   content: "\f024"
-
 .icon-headphones:before
   content: "\f025"
-
 .icon-volume-off:before
   content: "\f026"
-
 .icon-volume-down:before
   content: "\f027"
-
 .icon-volume-up:before
   content: "\f028"
-
 .icon-qrcode:before
   content: "\f029"
-
 .icon-barcode:before
   content: "\f02a"
-
 .icon-tag:before
   content: "\f02b"
-
 .icon-tags:before
   content: "\f02c"
-
 .icon-book:before
   content: "\f02d"
-
 .icon-bookmark:before
   content: "\f02e"
-
 .icon-print:before
   content: "\f02f"
-
 .icon-camera:before
   content: "\f030"
-
 .icon-font:before
   content: "\f031"
-
 .icon-bold:before
   content: "\f032"
-
 .icon-italic:before
   content: "\f033"
-
 .icon-text-height:before
   content: "\f034"
-
 .icon-text-width:before
   content: "\f035"
-
 .icon-align-left:before
   content: "\f036"
-
 .icon-align-center:before
   content: "\f037"
-
 .icon-align-right:before
   content: "\f038"
-
 .icon-align-justify:before
   content: "\f039"
-
 .icon-list:before
   content: "\f03a"
-
 .icon-indent-left:before
   content: "\f03b"
-
 .icon-indent-right:before
   content: "\f03c"
-
 .icon-facetime-video:before
   content: "\f03d"
-
 .icon-picture:before
   content: "\f03e"
-
 .icon-pencil:before
   content: "\f040"
-
 .icon-map-marker:before
   content: "\f041"
-
 .icon-adjust:before
   content: "\f042"
-
 .icon-tint:before
   content: "\f043"
-
 .icon-edit:before
   content: "\f044"
-
 .icon-share:before
   content: "\f045"
-
 .icon-check:before
   content: "\f046"
-
 .icon-move:before
   content: "\f047"
-
 .icon-step-backward:before
   content: "\f048"
-
 .icon-fast-backward:before
   content: "\f049"
-
 .icon-backward:before
   content: "\f04a"
-
 .icon-play:before
   content: "\f04b"
-
 .icon-pause:before
   content: "\f04c"
-
 .icon-stop:before
   content: "\f04d"
-
 .icon-forward:before
   content: "\f04e"
-
 .icon-fast-forward:before
   content: "\f050"
-
 .icon-step-forward:before
   content: "\f051"
-
 .icon-eject:before
   content: "\f052"
-
 .icon-chevron-left:before
   content: "\f053"
-
 .icon-chevron-right:before
   content: "\f054"
-
 .icon-plus-sign:before
   content: "\f055"
-
 .icon-minus-sign:before
   content: "\f056"
-
 .icon-remove-sign:before
   content: "\f057"
-
 .icon-ok-sign:before
   content: "\f058"
-
 .icon-question-sign:before
   content: "\f059"
-
 .icon-info-sign:before
   content: "\f05a"
-
 .icon-screenshot:before
   content: "\f05b"
-
 .icon-remove-circle:before
   content: "\f05c"
-
 .icon-ok-circle:before
   content: "\f05d"
-
 .icon-ban-circle:before
   content: "\f05e"
-
 .icon-arrow-left:before
   content: "\f060"
-
 .icon-arrow-right:before
   content: "\f061"
-
 .icon-arrow-up:before
   content: "\f062"
-
 .icon-arrow-down:before
   content: "\f063"
-
 .icon-share-alt:before
   content: "\f064"
-
 .icon-resize-full:before
   content: "\f065"
-
 .icon-resize-small:before
   content: "\f066"
-
 .icon-plus:before
   content: "\f067"
-
 .icon-minus:before
   content: "\f068"
-
 .icon-asterisk:before
   content: "\f069"
-
 .icon-exclamation-sign:before
   content: "\f06a"
-
 .icon-gift:before
   content: "\f06b"
-
 .icon-leaf:before
   content: "\f06c"
-
 .icon-fire:before
   content: "\f06d"
-
 .icon-eye-open:before
   content: "\f06e"
-
 .icon-eye-close:before
   content: "\f070"
-
 .icon-warning-sign:before
   content: "\f071"
-
 .icon-plane:before
   content: "\f072"
-
 .icon-calendar:before
   content: "\f073"
-
 .icon-random:before
   content: "\f074"
-
 .icon-comment:before
   content: "\f075"
-
 .icon-magnet:before
   content: "\f076"
-
 .icon-chevron-up:before
   content: "\f077"
-
 .icon-chevron-down:before
   content: "\f078"
-
 .icon-retweet:before
   content: "\f079"
-
 .icon-shopping-cart:before
   content: "\f07a"
-
 .icon-folder-close:before
   content: "\f07b"
-
 .icon-folder-open:before
   content: "\f07c"
-
 .icon-resize-vertical:before
   content: "\f07d"
-
 .icon-resize-horizontal:before
   content: "\f07e"
-
 .icon-bar-chart:before
   content: "\f080"
-
 .icon-twitter-sign:before
   content: "\f081"
-
 .icon-facebook-sign:before
   content: "\f082"
-
 .icon-camera-retro:before
   content: "\f083"
-
 .icon-key:before
   content: "\f084"
-
 .icon-cogs:before
   content: "\f085"
-
 .icon-comments:before
   content: "\f086"
-
 .icon-thumbs-up:before
   content: "\f087"
-
 .icon-thumbs-down:before
   content: "\f088"
-
 .icon-star-half:before
   content: "\f089"
-
 .icon-heart-empty:before
   content: "\f08a"
-
 .icon-signout:before
   content: "\f08b"
-
 .icon-linkedin-sign:before
   content: "\f08c"
-
 .icon-pushpin:before
   content: "\f08d"
-
 .icon-external-link:before
   content: "\f08e"
-
 .icon-signin:before
   content: "\f090"
-
 .icon-trophy:before
   content: "\f091"
-
 .icon-github-sign:before
   content: "\f092"
-
 .icon-upload-alt:before
   content: "\f093"
-
 .icon-lemon:before
   content: "\f094"
-
 .icon-phone:before
   content: "\f095"
-
 .icon-check-empty:before
   content: "\f096"
-
 .icon-bookmark-empty:before
   content: "\f097"
-
 .icon-phone-sign:before
   content: "\f098"
-
 .icon-twitter:before
   content: "\f099"
-
 .icon-facebook:before
   content: "\f09a"
-
 .icon-github:before
   content: "\f09b"
-
 .icon-unlock:before
   content: "\f09c"
-
 .icon-credit-card:before
   content: "\f09d"
-
 .icon-rss:before
   content: "\f09e"
-
 .icon-hdd:before
   content: "\f0a0"
-
 .icon-bullhorn:before
   content: "\f0a1"
-
 .icon-bell:before
   content: "\f0a2"
-
 .icon-certificate:before
   content: "\f0a3"
-
 .icon-hand-right:before
   content: "\f0a4"
-
 .icon-hand-left:before
   content: "\f0a5"
-
 .icon-hand-up:before
   content: "\f0a6"
-
 .icon-hand-down:before
   content: "\f0a7"
-
 .icon-circle-arrow-left:before
   content: "\f0a8"
-
 .icon-circle-arrow-right:before
   content: "\f0a9"
-
 .icon-circle-arrow-up:before
   content: "\f0aa"
-
 .icon-circle-arrow-down:before
   content: "\f0ab"
-
 .icon-globe:before
   content: "\f0ac"
-
 .icon-wrench:before
   content: "\f0ad"
-
 .icon-tasks:before
   content: "\f0ae"
-
 .icon-filter:before
   content: "\f0b0"
-
 .icon-briefcase:before
   content: "\f0b1"
-
 .icon-fullscreen:before
   content: "\f0b2"
-
 .icon-group:before
   content: "\f0c0"
-
 .icon-link:before
   content: "\f0c1"
-
 .icon-cloud:before
   content: "\f0c2"
-
 .icon-beaker:before
   content: "\f0c3"
-
 .icon-cut:before
   content: "\f0c4"
-
 .icon-copy:before
   content: "\f0c5"
-
 .icon-paper-clip:before
   content: "\f0c6"
-
 .icon-save:before
   content: "\f0c7"
-
 .icon-sign-blank:before
   content: "\f0c8"
-
 .icon-reorder:before
   content: "\f0c9"
-
 .icon-list-ul:before
   content: "\f0ca"
-
 .icon-list-ol:before
   content: "\f0cb"
-
 .icon-strikethrough:before
   content: "\f0cc"
-
 .icon-underline:before
   content: "\f0cd"
-
 .icon-table:before
   content: "\f0ce"
-
 .icon-magic:before
   content: "\f0d0"
-
 .icon-truck:before
   content: "\f0d1"
-
 .icon-pinterest:before
   content: "\f0d2"
-
 .icon-pinterest-sign:before
   content: "\f0d3"
-
 .icon-google-plus-sign:before
   content: "\f0d4"
-
 .icon-google-plus:before
   content: "\f0d5"
-
 .icon-money:before
   content: "\f0d6"
-
 .icon-caret-down:before
   content: "\f0d7"
-
 .icon-caret-up:before
   content: "\f0d8"
-
 .icon-caret-left:before
   content: "\f0d9"
-
 .icon-caret-right:before
   content: "\f0da"
-
 .icon-columns:before
   content: "\f0db"
-
 .icon-sort:before
   content: "\f0dc"
-
 .icon-sort-down:before
   content: "\f0dd"
-
 .icon-sort-up:before
   content: "\f0de"
-
 .icon-envelope-alt:before
   content: "\f0e0"
-
 .icon-linkedin:before
   content: "\f0e1"
-
 .icon-undo:before
   content: "\f0e2"
-
 .icon-legal:before
   content: "\f0e3"
-
 .icon-dashboard:before
   content: "\f0e4"
-
 .icon-comment-alt:before
   content: "\f0e5"
-
 .icon-comments-alt:before
   content: "\f0e6"
-
 .icon-bolt:before
   content: "\f0e7"
-
 .icon-sitemap:before
   content: "\f0e8"
-
 .icon-umbrella:before
   content: "\f0e9"
-
 .icon-paste:before
   content: "\f0ea"
-
+.icon-lightbulb:before
+  content: "\f0eb"
+.icon-exchange:before
+  content: "\f0ec"
+.icon-cloud-download:before
+  content: "\f0ed"
+.icon-cloud-upload:before
+  content: "\f0ee"
 .icon-user-md:before
-  content: "\f200"
+  content: "\f0f0"
+.icon-stethoscope:before
+  content: "\f0f1"
+.icon-suitcase:before
+  content: "\f0f2"
+.icon-bell-alt:before
+  content: "\f0f3"
+.icon-coffee:before
+  content: "\f0f4"
+.icon-food:before
+  content: "\f0f5"
+.icon-file-alt:before
+  content: "\f0f6"
+.icon-building:before
+  content: "\f0f7"
+.icon-hospital:before
+  content: "\f0f8"
+.icon-ambulance:before
+  content: "\f0f9"
+.icon-medkit:before
+  content: "\f0fa"
+.icon-fighter-jet:before
+  content: "\f0fb"
+.icon-beer:before
+  content: "\f0fc"
+.icon-h-sign:before
+  content: "\f0fd"
+.icon-plus-sign-alt:before
+  content: "\f0fe"
+.icon-double-angle-left:before
+  content: "\f100"
+.icon-double-angle-right:before
+  content: "\f101"
+.icon-double-angle-up:before
+  content: "\f102"
+.icon-double-angle-down:before
+  content: "\f103"
+.icon-angle-left:before
+  content: "\f104"
+.icon-angle-right:before
+  content: "\f105"
+.icon-angle-up:before
+  content: "\f106"
+.icon-angle-down:before
+  content: "\f107"
+.icon-desktop:before
+  content: "\f108"
+.icon-laptop:before
+  content: "\f109"
+.icon-tablet:before
+  content: "\f10a"
+.icon-mobile-phone:before
+  content: "\f10b"
+.icon-circle-blank:before
+  content: "\f10c"
+.icon-quote-left:before
+  content: "\f10d"
+.icon-quote-right:before
+  content: "\f10e"
+.icon-spinner:before
+  content: "\f110"
+.icon-circle:before
+  content: "\f111"
+.icon-reply:before
+  content: "\f112"
+.icon-github-alt:before
+  content: "\f113"
+.icon-folder-close-alt:before
+  content: "\f114"
+.icon-folder-open-alt:before
+  content: "\f115"

sass/font-awesome.scss

@@ -1,4 +1,4 @@
-/*  Font Awesome
+/*  Font Awesome 3.0
     the iconic font designed for use with Twitter Bootstrap
     -------------------------------------------------------
     The full suite of pictographic icons, examples, and documentation
@@ -6,13 +6,12 @@
 
     License
     -------------------------------------------------------
-    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
+    • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
-    http://creativecommons.org/licenses/by/3.0/ A mention of
+    • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
-    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
+      http://opensource.org/licenses/mit-license.html
-    source code is considered acceptable attribution (most common on the web).
+    • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
-    If human readable source code is not available to the end user, a mention in
+    • Attribution is no longer required in Font Awesome 3.0, but much appreciated:
-    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
+      "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
-    or mobile software).
 
     Contact
     -------------------------------------------------------
@@ -22,47 +21,71 @@
 
     */
 
-@import "compass/css3/font-face";
+$fontAwesomePath:   "../font" !default;
-$fontAwesomePath: "../font/fontawesome-webfont" !default;
+$borderColor:       #eee;
+$iconMuted:         #eee;
+@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; }
 
-@include font-face(
+
-    'FontAwesome',
+@font-face {
-    font-files(
+  font-family: 'FontAwesome';
-        "#{$fontAwesomePath}.woff", woff,
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot');
-        "#{$fontAwesomePath}.ttf", truetype,
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"),
-        "#{$fontAwesomePath}.svg#FontAwesomeRegular", svg),
+    url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"),
-    '#{$fontAwesomePath}.eot',
+    url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype");
-    normal,
+  font-weight: normal;
-    normal);
+  font-style: normal;
+}
 
 /*  Font Awesome styles
     ------------------------------------------------------- */
-[class^="icon-"]:before,
+/* includes sprites.less reset */
-[class*=" icon-"]:before {
+[class^="icon-"],
+[class*=" icon-"] {
   font-family: FontAwesome;
   font-weight: normal;
   font-style: normal;
-  display: inline-block;
   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;
 }
 
-a [class^="icon-"],
+[class^="icon-"]:before,
-a [class*=" icon-"] {
+[class*=" icon-"]:before {
-  display: inline-block;
   text-decoration: inherit;
+  display: inline-block;
+  speak: none;
+}
+
+/* makes sure icons active on rollover in links */
+a {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    display: inline-block;
+  }
 }
 
 /* makes the font 33% larger relative to the icon container */
 .icon-large:before {
-  vertical-align: middle;
+  vertical-align: -10%;
-  font-size: 4/3em;
+  font-size: 1.3333333333333333em;
 }
 
-.btn, .nav-tabs {
+.btn, .nav {
   [class^="icon-"],
   [class*=" icon-"] {
-  /* keeps button heights with and without icons the same */
+    display: inline;
-    line-height: .9em;
+    /* keeps button heights with and without icons the same */
+    line-height: .6em;
+    &.icon-spin {
+      display: inline-block;
+    }
   }
 }
 
@@ -72,33 +95,139 @@ li {
     display: inline-block;
     width: 1.25em;
     text-align: center;
-  }
+    &.icon-large {
-  .icon-large:before,
+      /* increased font size for icon-large */
-  .icon-large:before {
+      width: 1.25*1.25em;
-    /* 1.5 increased font size for icon-large * 1.25 width */
+    }
-    width: 1.5*1.25em;
   }
 }
 
 ul.icons {
   list-style-type: none;
-  margin-left: 2em;
+  text-indent: -.75em;
-  text-indent: -.8em;
 
   li {
     [class^="icon-"],
     [class*=" icon-"] {
-      width: .8em;
+      width: .75em;
-    }
-    .icon-large:before,
-    .icon-large:before {
-      /* 1.5 increased font size for icon-large * 1.25 width */
-      vertical-align: initial;
-//      width: 1.5*1.25em;
     }
   }
 }
 
+.icon-muted {
+  color: $iconMuted;
+}
+
+// Icon Borders
+// -------------------------
+
+.icon-border {
+  border: solid 1px $borderColor;
+  padding: .2em .25em .15em;
+  @include border-radius(3px);
+}
+
+// Icon Sizes
+// -------------------------
+
+.icon-2x {
+  font-size: 2em;
+  &.icon-border {
+    border-width: 2px;
+    @include border-radius(4px);
+  }
+}
+.icon-3x {
+  font-size: 3em;
+  &.icon-border {
+    border-width: 3px;
+    @include border-radius(5px);
+  }
+}
+.icon-4x {
+  font-size: 4em;
+  &.icon-border {
+    border-width: 4px;
+    @include border-radius(6px);
+  }
+}
+
+// Floats
+// -------------------------
+
+// Quick floats
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+[class^="icon-"],
+[class*=" icon-"] {
+  &.pull-left {
+    margin-right: .35em;
+  }
+  &.pull-right {
+    margin-left: .35em;
+  }
+}
+
+.btn {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right {
+      &.icon-2x { margin-top: .35em; }
+    }
+    &.icon-spin.icon-large { height: .75em; }
+  }
+}
+
+.btn.btn-small {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right {
+      &.icon-2x { margin-top: .45em; }
+    }
+  }
+}
+
+.btn.btn-large {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right {
+      &.icon-2x { margin-top: .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); }
+}
+
+
 /*  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"; }
@@ -325,5 +454,46 @@ ul.icons {
 .icon-sitemap:before              { content: "\f0e8"; }
 .icon-umbrella:before             { content: "\f0e9"; }
 .icon-paste:before                { content: "\f0ea"; }
+.icon-lightbulb:before            { content: "\f0eb"; }
+.icon-exchange:before             { content: "\f0ec"; }
+.icon-cloud-download:before       { content: "\f0ed"; }
+.icon-cloud-upload:before         { content: "\f0ee"; }
 
-.icon-user-md:before              { content: "\f200"; }
+.icon-user-md:before              { content: "\f0f0"; }
+.icon-stethoscope:before          { content: "\f0f1"; }
+.icon-suitcase:before             { content: "\f0f2"; }
+.icon-bell-alt:before             { content: "\f0f3"; }
+.icon-coffee:before               { content: "\f0f4"; }
+.icon-food:before                 { content: "\f0f5"; }
+.icon-file-alt:before             { content: "\f0f6"; }
+.icon-building:before             { content: "\f0f7"; }
+.icon-hospital:before             { content: "\f0f8"; }
+.icon-ambulance:before            { content: "\f0f9"; }
+.icon-medkit:before               { content: "\f0fa"; }
+.icon-fighter-jet:before          { content: "\f0fb"; }
+.icon-beer:before                 { content: "\f0fc"; }
+.icon-h-sign:before               { content: "\f0fd"; }
+.icon-plus-sign-alt:before        { content: "\f0fe"; }
+
+.icon-double-angle-left:before    { content: "\f100"; }
+.icon-double-angle-right:before   { content: "\f101"; }
+.icon-double-angle-up:before      { content: "\f102"; }
+.icon-double-angle-down:before    { content: "\f103"; }
+.icon-angle-left:before           { content: "\f104"; }
+.icon-angle-right:before          { content: "\f105"; }
+.icon-angle-up:before             { content: "\f106"; }
+.icon-angle-down:before           { content: "\f107"; }
+.icon-desktop:before              { content: "\f108"; }
+.icon-laptop:before               { content: "\f109"; }
+.icon-tablet:before               { content: "\f10a"; }
+.icon-mobile-phone:before         { content: "\f10b"; }
+.icon-circle-blank:before         { content: "\f10c"; }
+.icon-quote-left:before           { content: "\f10d"; }
+.icon-quote-right:before          { content: "\f10e"; }
+
+.icon-spinner:before              { content: "\f110"; }
+.icon-circle:before               { content: "\f111"; }
+.icon-reply:before                { content: "\f112"; }
+.icon-github-alt:before           { content: "\f113"; }
+.icon-folder-close-alt:before     { content: "\f114"; }
+.icon-folder-open-alt:before      { content: "\f115"; }