Merge branch 'master' into restore_grid_mixins

Conflicts:
	dist/css/bootstrap.min.css

3 files changed, 16 insertions, 13 deletions

diff --git a/less/code.less b/less/code.less
index 88bcde552..e12835401 100644
--- a/less/code.less
+++ b/less/code.less
@@ -42,7 +42,7 @@ pre {
     color: inherit;
     white-space: pre-wrap;
     background-color: transparent;
-    border: 0;
+    border-radius: 0;
   }
 }
 
diff --git a/less/navs.less b/less/navs.less
index 3b6a43a7d..b1d4fcd23 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -227,13 +227,11 @@
   .clearfix();
 }
 
-// Show/hide tabbable areas
-.tab-content > .tab-pane,
-.pill-content > .pill-pane {
-  display: none;
-}
-.tab-content,
-.pill-content {
+// Hide tabbable panes to start, show them when `.active`
+.tab-content {
+  > .tab-pane {
+    display: none;
+  }
   > .active {
     display: block;
   }
diff --git a/less/type.less b/less/type.less
index 55e5e1d77..e5544ab3e 100644
--- a/less/type.less
+++ b/less/type.less
@@ -82,7 +82,8 @@ h1, h2, h3, h4, h5, h6,
   line-height: @headings-line-height;
   color: @headings-color;
 
-  small {
+  small,
+  .small {
     font-weight: normal;
     line-height: 1;
     color: @headings-small-color;
@@ -95,7 +96,8 @@ h3 {
   margin-top: @line-height-computed;
   margin-bottom: (@line-height-computed / 2);
 
-  small {
+  small,
+  .small {
     font-size: 65%;
   }
 }
@@ -105,7 +107,8 @@ h6 {
   margin-top: (@line-height-computed / 2);
   margin-bottom: (@line-height-computed / 2);
 
-  small {
+  small,
+  .small {
     font-size: 75%;
   }
 }
@@ -240,10 +243,12 @@ blockquote {
     border-right: 5px solid @blockquote-border-color;
     border-left: 0;
     p,
-    small {
+    small,
+    .small {
       text-align: right;
     }
-    small {
+    small,
+    .small {
       &:before {
         content: '';
       }