Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css

1 files changed, 30 insertions, 11 deletions

diff --git a/dist/css/bootstrap.css b/dist/css/bootstrap.css
index dc11c7221..4cefadc05 100644
--- a/dist/css/bootstrap.css
+++ b/dist/css/bootstrap.css
@@ -495,7 +495,19 @@ h6 small,
 .h3 small,
 .h4 small,
 .h5 small,
-.h6 small {
+.h6 small,
+h1 .small,
+h2 .small,
+h3 .small,
+h4 .small,
+h5 .small,
+h6 .small,
+.h1 .small,
+.h2 .small,
+.h3 .small,
+.h4 .small,
+.h5 .small,
+.h6 .small {
   font-weight: normal;
   line-height: 1;
   color: #999999;
@@ -510,7 +522,10 @@ h3 {
 
 h1 small,
 h2 small,
-h3 small {
+h3 small,
+h1 .small,
+h2 .small,
+h3 .small {
   font-size: 65%;
 }
 
@@ -523,7 +538,10 @@ h6 {
 
 h4 small,
 h5 small,
-h6 small {
+h6 small,
+h4 .small,
+h5 .small,
+h6 .small {
   font-size: 75%;
 }
 
@@ -685,15 +703,18 @@ blockquote.pull-right {
 }
 
 blockquote.pull-right p,
-blockquote.pull-right small {
+blockquote.pull-right small,
+blockquote.pull-right .small {
   text-align: right;
 }
 
-blockquote.pull-right small:before {
+blockquote.pull-right small:before,
+blockquote.pull-right .small:before {
   content: '';
 }
 
-blockquote.pull-right small:after {
+blockquote.pull-right small:after,
+blockquote.pull-right .small:after {
   content: '\00A0 \2014';
 }
 
@@ -744,7 +765,7 @@ pre code {
   color: inherit;
   white-space: pre-wrap;
   background-color: transparent;
-  border: 0;
+  border-radius: 0;
 }
 
 .pre-scrollable {
@@ -4220,13 +4241,11 @@ textarea.input-group-sm > .input-group-btn > .btn {
   clear: both;
 }
 
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
+.tab-content > .tab-pane {
   display: none;
 }
 
-.tab-content > .active,
-.pill-content > .active {
+.tab-content > .active {
   display: block;
 }