From 07a3ea5f54e6495fa3d8f548b374a312119ce0f1 Mon Sep 17 00:00:00 2001
From: Chris Rebert <code@rebertia.com>
Date: Tue, 20 Jan 2015 16:24:34 -0800
Subject: Add .glyphicon-* aliases for other ISO 4217-ish currency codes

Fixes #15617.
---
 dist/css/bootstrap.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'dist/css/bootstrap.css')

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";
 }
-- 
cgit v1.2.3


From 5e26ad4921fe684623d0dabe5f2117ff9b07261a Mon Sep 17 00:00:00 2001
From: Bootstrap's Grunt bot <twbs-grunt@users.noreply.github.com>
Date: Thu, 22 Jan 2015 03:01:38 +0000
Subject: automatic grunt dist

---
 dist/css/bootstrap.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'dist/css/bootstrap.css')

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index 5b2a5798b..ccfd81615 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -4825,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;
 }
-- 
cgit v1.2.3