-
Longer
@@ -233,7 +246,7 @@
+
Bullets should wrap appropriately, have proper spacing
+
Spinning icons icons should be aligned well and on center, buttons should be same height, won't work in ie7
+
+
+
+
\ No newline at end of file
diff --git a/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf
index 88ef26220..d46172476 100755
Binary files a/font/fontawesome-webfont.ttf and b/font/fontawesome-webfont.ttf differ
diff --git a/font/fontawesome-webfont.woff b/font/fontawesome-webfont.woff
index 7e892f878..3c89ae09b 100755
Binary files a/font/fontawesome-webfont.woff and b/font/fontawesome-webfont.woff differ
diff --git a/less/font-awesome-ie7.less b/less/font-awesome-ie7.less
index 2fb977a28..26fe6376b 100644
--- a/less/font-awesome-ie7.less
+++ b/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-"] {
diff --git a/less/font-awesome.less b/less/font-awesome.less
index fddf0d5b3..7ba267338 100644
--- a/less/font-awesome.less
+++ b/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/
+/*!
+ * 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";
@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 */
diff --git a/sass/font-awesome.sass b/sass/font-awesome.sass
index 8d54b9047..bae1338ca 100644
--- a/sass/font-awesome.sass
+++ b/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
+ margin-top: 0
-[class^="icon-"]:before, [class*=" icon-"]:before
+/* 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
diff --git a/sass/font-awesome.scss b/sass/font-awesome.scss
index 6f3496916..16cd3c919 100644
--- a/sass/font-awesome.scss
+++ b/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 */