aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rebert <[email protected]>2015-01-21 13:16:57 -0800
committerChris Rebert <[email protected]>2015-01-21 13:16:57 -0800
commit22a4d96e9a04bbffed1a9b752eda5cc356300dc3 (patch)
tree48accdadb3d826e208308f0db2c5a4180d634d04
parent1ce502dc4de0accf27a6c37c21d26f4739d09241 (diff)
parent07a3ea5f54e6495fa3d8f548b374a312119ce0f1 (diff)
downloadbootstrap-22a4d96e9a04bbffed1a9b752eda5cc356300dc3.tar.xz
bootstrap-22a4d96e9a04bbffed1a9b752eda5cc356300dc3.zip
Merge pull request #15620 from twbs/iso-4217
Add .glyphicon-* aliases for other ISO 4217-ish currency codes
-rw-r--r--dist/css/bootstrap.css12
-rw-r--r--docs/_data/glyphicons.yml4
-rw-r--r--less/glyphicons.less4
3 files changed, 20 insertions, 0 deletions
diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index c46af7dfb..5b2a5798b 100644
--- a/dist/css/bootstrap.css
+++ b/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";
}
diff --git a/docs/_data/glyphicons.yml b/docs/_data/glyphicons.yml
index ade750912..338e99398 100644
--- a/docs/_data/glyphicons.yml
+++ b/docs/_data/glyphicons.yml
@@ -227,8 +227,12 @@
- glyphicon-piggy-bank
- glyphicon-scissors
- glyphicon-bitcoin
+- glyphicon-btc
+- glyphicon-xbt
- glyphicon-yen
+- glyphicon-jpy
- glyphicon-ruble
+- glyphicon-rub
- glyphicon-scale
- glyphicon-ice-lolly
- glyphicon-ice-lolly-tasted
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"; } }