diff --git a/css/font-awesome-ie7.css b/css/font-awesome-ie7.css
index 3bef79cb7..3d944f93b 100644
--- a/css/font-awesome-ie7.css
+++ b/css/font-awesome-ie7.css
@@ -5,6 +5,11 @@
font-weight: normal;
}
+.btn.dropdown-toggle [class^="icon-"], .btn.dropdown-toggle [class*=" icon-"] {
+ /* keeps button heights with and without icons the same */
+ line-height: 1.4em;
+}
+
.icon-large {
font-size: 1.3333em;
}
diff --git a/font/fontawesome-webfont.eot b/font/fontawesome-webfont.eot
index 69f31d2f0..e01dc1ca8 100755
Binary files a/font/fontawesome-webfont.eot and b/font/fontawesome-webfont.eot differ
diff --git a/font/fontawesome-webfont.svg b/font/fontawesome-webfont.svg
index a45c0c91c..63d4fd1ab 100755
--- a/font/fontawesome-webfont.svg
+++ b/font/fontawesome-webfont.svg
@@ -8,7 +8,6 @@
-
@@ -30,8 +29,10 @@
+
+
@@ -46,7 +47,7 @@
-
+
@@ -171,7 +172,7 @@
-
+
@@ -180,7 +181,7 @@
-
+
@@ -196,7 +197,7 @@
-
+
@@ -212,20 +213,20 @@
-
-
-
-
+
+
+
+
-
+
-
-
+
+
diff --git a/font/fontawesome-webfont.ttf b/font/fontawesome-webfont.ttf
index 49206391c..2c519bfe1 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 a52b1f584..8bec43e4e 100755
Binary files a/font/fontawesome-webfont.woff and b/font/fontawesome-webfont.woff differ
diff --git a/less/font-awesome.less b/less/font-awesome.less
index a53dd4c25..7c932155d 100644
--- a/less/font-awesome.less
+++ b/less/font-awesome.less
@@ -28,12 +28,11 @@
src: url('../font/fontawesome-webfont.eot?#iefix') format('embedded-opentype'),
url('../font/fontawesome-webfont.woff') format('woff'),
url('../font/fontawesome-webfont.ttf') format('truetype'),
- url('../font/fontawesome-webfont.svg#FontAwesomeRegular') format('svg');
+ url('../font/fontawesome-webfont.svg#FontAwesome') format('svg');
font-weight: normal;
font-style: normal;
}
-
/* Font Awesome styles
------------------------------------------------------- */
[class^="icon-"]:before,
@@ -72,24 +71,29 @@ li {
width: 1.25em;
text-align: center;
}
- .icon-large[class^="icon-"],
- .icon-large[class*=" icon-"] {
- /* 1.5 increased font size for icon-large * 1.25 width */
+ .icon-large:before,
+ .icon-large:before {
+ /* 1.5 increased font size for icon-large * 1.25 width */
width: 1.5*1.25em;
}
}
-li[class^="icon-"],
-li[class*=" icon-"] {
- margin-left: 0;
+ul.icons {
list-style-type: none;
+ margin-left: 2em;
+ text-indent: -.8em;
- &:before {
- text-indent: -2em;
- text-align: center;
- }
- &.icon-large:before {
- text-indent: -4/3em;
+ li {
+ [class^="icon-"],
+ [class*=" icon-"] {
+ width: .8em;
+ }
+ .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;
+ }
}
}