final adjustments to changing css icon prefix

2 files changed, 14 insertions, 44 deletions

diff --git a/less/bootstrap.less b/less/bootstrap.less
index 7a407e317..6115cda97 100644
--- a/less/bootstrap.less
+++ b/less/bootstrap.less
@@ -2,8 +2,7 @@
  * -------------------------- */
 
 /* Bootstrap 2.0 sprites.less reset */
-[class^="fa-"],
-[class*=" fa-"] {
+.fa {
   display: inline;
   width: auto;
   height: auto;
@@ -15,42 +14,22 @@
   background-repeat: repeat;
 }
 
-/* more sprites.less reset */
-.icon-white,
-.nav-pills > .active > a > [class^="fa-"],
-.nav-pills > .active > a > [class*=" fa-"],
-.nav-list > .active > a > [class^="fa-"],
-.nav-list > .active > a > [class*=" fa-"],
-.navbar-inverse .nav > .active > a > [class^="fa-"],
-.navbar-inverse .nav > .active > a > [class*=" fa-"],
-.dropdown-menu > li > a:hover > [class^="fa-"],
-.dropdown-menu > li > a:hover > [class*=" fa-"],
-.dropdown-menu > .active > a > [class^="fa-"],
-.dropdown-menu > .active > a > [class*=" fa-"],
-.dropdown-submenu:hover > a > [class^="fa-"],
-.dropdown-submenu:hover > a > [class*=" fa-"] {
-  background-image: none;
-}
-
 
 /* keeps Bootstrap styles with and without icons the same */
 .btn, .nav {
-  [class^="fa-"],
-  [class*=" fa-"] {
+  .fa {
 //    display: inline;
     &.fa-large { line-height: .9em; }
     &.fa-spin { display: inline-block; }
   }
 }
 .nav-tabs, .nav-pills {
-  [class^="fa-"],
-  [class*=" fa-"] {
+  .fa {
     &, &.fa-large { line-height: .9em; }
   }
 }
 .btn {
-  [class^="fa-"],
-  [class*=" fa-"] {
+  .fa {
     &.pull-left, &.pull-right {
       &.fa-2x { margin-top: .18em; }
     }
@@ -58,16 +37,14 @@
   }
 }
 .btn.btn-small {
-  [class^="fa-"],
-  [class*=" fa-"] {
+  .fa {
     &.pull-left, &.pull-right {
       &.fa-2x { margin-top: .25em; }
     }
   }
 }
 .btn.btn-large {
-  [class^="fa-"],
-  [class*=" fa-"] {
+  .fa {
     margin-top: 0; // overrides bootstrap default
     &.pull-left, &.pull-right {
       &.fa-2x { margin-top: .05em; }
@@ -78,7 +55,6 @@
 }
 
 /* Fixes alignment in nav lists */
-.nav-list [class^="fa-"],
-.nav-list [class*=" fa-"] {
+.nav-list .fa {
   line-height: inherit;
 }
diff --git a/less/core.less b/less/core.less
index 8ca3bf7c1..e43a54a6d 100644
--- a/less/core.less
+++ b/less/core.less
@@ -1,13 +1,11 @@
 /* FONT AWESOME CORE
  * -------------------------- */
 
-[class^="fa-"],
-[class*=" fa-"] {
+.fa {
   .icon-FontAwesome();
 }
 
-[class^="fa-"]:before,
-[class*=" fa-"]:before {
+.fa:before {
   display: inline-block;
   text-decoration: inherit;
   speak: none;
@@ -21,15 +19,13 @@
 
 /* makes sure icons active on rollover in links */
 a {
-  [class^="fa-"],
-  [class*=" fa-"] {
+  .fa {
     display: inline;
   }
 }
 
 /* increased font size for icon-large */
-[class^="fa-"],
-[class*=" fa-"] {
+.fa {
   &.fa-fixed-width {
     display: inline-block;
     width: (16em / 14);
@@ -41,7 +37,7 @@ a {
   }
 }
 
-.fas-ul {
+.fa-ul {
   padding-left: 0;
   margin-left: @icons-li-width;
   list-style-type: none;
@@ -58,8 +54,7 @@ a {
 }
 
 // allows usage of the hide class directly on font awesome icons
-[class^="fa-"],
-[class*=" fa-"] {
+.fa {
   &.hide {
     display: none;
   }
@@ -119,8 +114,7 @@ a {
 .pull-right { float: right; }
 .pull-left { float: left; }
 
-[class^="fa-"],
-[class*=" fa-"] {
+.fa {
   &.pull-left {
     margin-right: .3em;
   }