tweaks to icons defaults and in buttons improve vertical align

4b3fb308 · Mark Otto · 72198a59 · 4b3fb308 · 4b3fb308 · 4b3fb308
Commit 4b3fb308 authored 12 years ago by Mark Otto
Hide whitespace changes
Inline Side-by-side

Showing

with 13 additions and 14 deletions
+13 -14
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2162,8 +2162,9 @@ table th[class*="span"],
 }
 [class^="glyphicon-"]:before {
-  display: inline-block;
+  font-family: 'Glyphicons Halflings';
-  font: normal 12px/1 'Glyphicons Halflings';
+  font-style: normal;
+  line-height: 1;
 }
 .glyphicon-glass:before {
@@ -3237,16 +3238,13 @@ button.close {
          border-radius: 3px;
 }
-.btn-large [class^="glyphicon-"]::before {
+.btn [class^="glyphicon-"]::before {
-  font-size: 14px;
+  vertical-align: -2px;
-}
-.btn-small [class^="glyphicon-"]::before {
-  font-size: 10px;
 }
+.btn-small [class^="glyphicon-"]::before,
 .btn-mini [class^="glyphicon-"]::before {
-  font-size: 9px;
+  vertical-align: -1px;
 }
 .btn-block {

--- a/less/buttons.less
+++ b/less/buttons.less
@@ -95,9 +95,9 @@
 // Icons in buttons
 // -------------------------
-.btn-large [class^="glyphicon-"]::before { font-size: 14px; }
+.btn [class^="glyphicon-"]::before       { vertical-align: -2px; }
-.btn-small [class^="glyphicon-"]::before { font-size: 10px; }
+.btn-small [class^="glyphicon-"]::before,
-.btn-mini [class^="glyphicon-"]::before  { font-size: 9px; }
+.btn-mini [class^="glyphicon-"]::before  { vertical-align: -1px; }
 // Block button

--- a/less/glyphicons.less
+++ b/less/glyphicons.less
@@ -32,8 +32,9 @@
 // Catchall baseclass
 [class^="glyphicon-"]:before {
-  display: inline-block;
+  font-family: 'Glyphicons Halflings';
-  font: normal 12px/1 'Glyphicons Halflings';
+  font-style: normal;
+  line-height: 1;
 }
 // Individual icons