diff options
| author | Mark Otto <[email protected]> | 2012-11-02 01:39:40 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-02 01:39:40 -0700 |
| commit | 4b3fb3087738ba2836538bacd34256503b6afc96 (patch) | |
| tree | 64c2340ebec9d57329aeda32256cae6a11edf0c8 | |
| parent | 72198a59c056857d93d35b5e3251b1baf8b5ab1c (diff) | |
| download | bootstrap-4b3fb3087738ba2836538bacd34256503b6afc96.tar.xz bootstrap-4b3fb3087738ba2836538bacd34256503b6afc96.zip | |
tweaks to icons defaults and in buttons improve vertical align
| -rw-r--r-- | docs/assets/css/bootstrap.css | 16 | ||||
| -rw-r--r-- | less/buttons.less | 6 | ||||
| -rw-r--r-- | less/glyphicons.less | 5 |
3 files changed, 13 insertions, 14 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 52865cf0d..2600fc4d4 100644 --- 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: normal 12px/1 'Glyphicons Halflings'; + font-family: '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 { - font-size: 14px; -} - -.btn-small [class^="glyphicon-"]::before { - font-size: 10px; +.btn [class^="glyphicon-"]::before { + vertical-align: -2px; } +.btn-small [class^="glyphicon-"]::before, .btn-mini [class^="glyphicon-"]::before { - font-size: 9px; + vertical-align: -1px; } .btn-block { diff --git a/less/buttons.less b/less/buttons.less index 3e07b2b05..45bd07604 100644 --- a/less/buttons.less +++ b/less/buttons.less @@ -95,9 +95,9 @@ // Icons in buttons // ------------------------- -.btn-large [class^="glyphicon-"]::before { font-size: 14px; } -.btn-small [class^="glyphicon-"]::before { font-size: 10px; } -.btn-mini [class^="glyphicon-"]::before { font-size: 9px; } +.btn [class^="glyphicon-"]::before { vertical-align: -2px; } +.btn-small [class^="glyphicon-"]::before, +.btn-mini [class^="glyphicon-"]::before { vertical-align: -1px; } // Block button diff --git a/less/glyphicons.less b/less/glyphicons.less index 64e954f35..ad22b4579 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -32,8 +32,9 @@ // Catchall baseclass [class^="glyphicon-"]:before { - display: inline-block; - font: normal 12px/1 'Glyphicons Halflings'; + font-family: 'Glyphicons Halflings'; + font-style: normal; + line-height: 1; } // Individual icons |