From b381eb6d25959a74167eb436db70a9db19f8b0b4 Mon Sep 17 00:00:00 2001 From: davegandy Date: Sat, 4 May 2013 22:19:59 -0400 Subject: [PATCH] fixing #690 --- build/assets/css/font-awesome.css | 25 ++----------------------- build/assets/less/font-awesome.less | 11 ++--------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/build/assets/css/font-awesome.css b/build/assets/css/font-awesome.css index 0b82036de..2ee9c32e2 100644 --- a/build/assets/css/font-awesome.css +++ b/build/assets/css/font-awesome.css @@ -80,13 +80,12 @@ a [class*=" icon-"] { vertical-align: -10%; font-size: 1.3333333333333333em; } +/* keeps button heights with and without icons the same */ .btn [class^="icon-"], .nav [class^="icon-"], .btn [class*=" icon-"], .nav [class*=" icon-"] { display: inline; - /* keeps button heights with and without icons the same */ - } .btn [class^="icon-"].icon-large, .nav [class^="icon-"].icon-large, @@ -100,13 +99,7 @@ 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 */ - -} +/* keeps button heights with and without icons the same */ .nav-tabs [class^="icon-"], .nav-pills [class^="icon-"], .nav-tabs [class*=" icon-"], @@ -287,20 +280,6 @@ ul.icons-ul > li .icon-li { 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 { diff --git a/build/assets/less/font-awesome.less b/build/assets/less/font-awesome.less index f6dea0b48..0c5b60416 100644 --- a/build/assets/less/font-awesome.less +++ b/build/assets/less/font-awesome.less @@ -100,20 +100,20 @@ a { font-size: 4/3em; } +/* keeps button heights with and without icons the same */ .btn, .nav { [class^="icon-"], [class*=" icon-"] { display: inline; - /* keeps button heights with and without icons the same */ &.icon-large { line-height: .9em; } &.icon-spin { display: inline-block; } } } +/* keeps button heights with and without icons the same */ .nav-tabs, .nav-pills { [class^="icon-"], [class*=" icon-"] { - /* keeps button heights with and without icons the same */ &, &.icon-large { line-height: .9em; } } } @@ -131,7 +131,6 @@ li, .nav li { } } - ul.icons-ul { list-style-type: none; text-indent: -9/14em; @@ -278,12 +277,6 @@ ul.icons-ul { 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 */