Merge branch 'master' of github.com:twbs/bootstrap

3 files changed, 13 insertions, 8 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/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: '';
       }
diff --git a/package.json b/package.json
index c60f2decf..a4b5fdefb 100644
--- a/package.json
+++ b/package.json
@@ -20,7 +20,8 @@
     }
   ]
   , "devDependencies": {
-      "btoa": "~1.1.1"
+      "browserstack-runner": "~0.0.12"
+    , "btoa": "~1.1.1"
     , "grunt": "~0.4.1"
     , "grunt-contrib-clean": "~0.5.0"
     , "grunt-contrib-concat": "~0.3.0"
@@ -33,6 +34,5 @@
     , "grunt-html-validation": "~0.1.5"
     , "grunt-jekyll": "~0.4.0"
     , "grunt-recess": "~0.4.0"
-    , "browserstack-runner": "~0.0.12"
   }
 }