diff options
| author | Mark Otto <[email protected]> | 2015-01-21 20:16:08 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-01-21 20:16:08 -0800 |
| commit | a3890a72cfce45265028413b2e6677b968bdc6a5 (patch) | |
| tree | 82d322a95d2f709792c2ec69526a522ee9618907 /docs/dist/css/bootstrap.css | |
| parent | 53d2abff922ad1ca776750657d98415a6fedb635 (diff) | |
| parent | c64c8636376af76acd01f132203af162fafb39bc (diff) | |
| download | bootstrap-a3890a72cfce45265028413b2e6677b968bdc6a5.tar.xz bootstrap-a3890a72cfce45265028413b2e6677b968bdc6a5.zip | |
Merge branch 'master' into move-inline-css
Conflicts:
docs/assets/css/docs.min.css
Diffstat (limited to 'docs/dist/css/bootstrap.css')
| -rw-r--r-- | docs/dist/css/bootstrap.css | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/docs/dist/css/bootstrap.css b/docs/dist/css/bootstrap.css index c46af7dfb..ccfd81615 100644 --- a/docs/dist/css/bootstrap.css +++ b/docs/dist/css/bootstrap.css @@ -958,12 +958,24 @@ th { .glyphicon-bitcoin:before { content: "\e227"; } +.glyphicon-btc:before { + content: "\e227"; +} +.glyphicon-xbt:before { + content: "\e227"; +} .glyphicon-yen:before { content: "\00a5"; } +.glyphicon-jpy:before { + content: "\00a5"; +} .glyphicon-ruble:before { content: "\20bd"; } +.glyphicon-rub:before { + content: "\20bd"; +} .glyphicon-scale:before { content: "\e230"; } @@ -4813,7 +4825,8 @@ a.label:focus { position: relative; top: -1px; } -.btn-xs .badge { +.btn-xs .badge, +.btn-group-xs > .btn .badge { top: 0; padding: 1px 5px; } |