davegandy 12 years ago
parent
commit
b381eb6d25
2 changed files with 4 additions and 32 deletions
  1. 2 23
      build/assets/css/font-awesome.css
  2. 2 9
      build/assets/less/font-awesome.less

+ 2 - 23
build/assets/css/font-awesome.css

@@ -80,13 +80,12 @@ a [class*=" icon-"] {
   vertical-align: -10%;
   vertical-align: -10%;
   font-size: 1.3333333333333333em;
   font-size: 1.3333333333333333em;
 }
 }
+/* keeps button heights with and without icons the same */
 .btn [class^="icon-"],
 .btn [class^="icon-"],
 .nav [class^="icon-"],
 .nav [class^="icon-"],
 .btn [class*=" icon-"],
 .btn [class*=" icon-"],
 .nav [class*=" icon-"] {
 .nav [class*=" icon-"] {
   display: inline;
   display: inline;
-  /* keeps button heights with and without icons the same */
-
 }
 }
 .btn [class^="icon-"].icon-large,
 .btn [class^="icon-"].icon-large,
 .nav [class^="icon-"].icon-large,
 .nav [class^="icon-"].icon-large,
@@ -100,13 +99,7 @@ a [class*=" icon-"] {
 .nav [class*=" icon-"].icon-spin {
 .nav [class*=" icon-"].icon-spin {
   display: inline-block;
   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 */
-
-}
+/* keeps button heights with and without icons the same */
 .nav-tabs [class^="icon-"],
 .nav-tabs [class^="icon-"],
 .nav-pills [class^="icon-"],
 .nav-pills [class^="icon-"],
 .nav-tabs [class*=" icon-"],
 .nav-tabs [class*=" icon-"],
@@ -287,20 +280,6 @@ ul.icons-ul > li .icon-li {
     transform: rotate(359deg);
     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
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */
     readers do not read off random characters that represent icons */
 .icon-glass:before {
 .icon-glass:before {

+ 2 - 9
build/assets/less/font-awesome.less

@@ -100,20 +100,20 @@ a {
   font-size: 4/3em;
   font-size: 4/3em;
 }
 }
 
 
+/* keeps button heights with and without icons the same */
 .btn, .nav {
 .btn, .nav {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
     display: inline;
     display: inline;
-    /* keeps button heights with and without icons the same */
     &.icon-large { line-height: .9em; }
     &.icon-large { line-height: .9em; }
     &.icon-spin { display: inline-block; }
     &.icon-spin { display: inline-block; }
   }
   }
 }
 }
 
 
+/* keeps button heights with and without icons the same */
 .nav-tabs, .nav-pills {
 .nav-tabs, .nav-pills {
   [class^="icon-"],
   [class^="icon-"],
   [class*=" icon-"] {
   [class*=" icon-"] {
-  /* keeps button heights with and without icons the same */
     &, &.icon-large { line-height: .9em; }
     &, &.icon-large { line-height: .9em; }
   }
   }
 }
 }
@@ -131,7 +131,6 @@ li, .nav li {
   }
   }
 }
 }
 
 
-
 ul.icons-ul {
 ul.icons-ul {
   list-style-type: none;
   list-style-type: none;
   text-indent: -9/14em;
   text-indent: -9/14em;
@@ -278,12 +277,6 @@ ul.icons-ul {
   100% { transform: rotate(359deg); }
   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
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */
     readers do not read off random characters that represent icons */