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 /less | |
| 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 'less')
| -rw-r--r-- | less/badges.less | 3 | ||||
| -rw-r--r-- | less/glyphicons.less | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/less/badges.less b/less/badges.less index 0817323a6..c70bb939e 100644 --- a/less/badges.less +++ b/less/badges.less @@ -29,7 +29,8 @@ top: -1px; } - .btn-xs & { + .btn-xs &, + .btn-group-xs > .btn & { top: 0; padding: 1px 5px; } diff --git a/less/glyphicons.less b/less/glyphicons.less index 8b25f89a5..335d80aa6 100644 --- a/less/glyphicons.less +++ b/less/glyphicons.less @@ -266,8 +266,12 @@ .glyphicon-piggy-bank { &:before { content: "\e225"; } } .glyphicon-scissors { &:before { content: "\e226"; } } .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"; } } .glyphicon-ice-lolly { &:before { content: "\e231"; } } .glyphicon-ice-lolly-tasted { &:before { content: "\e232"; } } |