Merge branch 'master' into deprecate_screen_containers

7 files changed, 28 insertions, 23 deletions

diff --git a/less/buttons.less b/less/buttons.less
index 5d60d39a7..40511ab96 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -17,6 +17,7 @@
   text-align: center;
   vertical-align: middle;
   cursor: pointer;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid transparent;
   border-radius: @border-radius-base;
   white-space: nowrap;
diff --git a/less/forms.less b/less/forms.less
index 896619868..32391942b 100644
--- a/less/forms.less
+++ b/less/forms.less
@@ -133,6 +133,7 @@ output {
   color: @input-color;
   vertical-align: middle;
   background-color: @input-bg;
+  background-image: none; // Reset unusual Firefox-on-Android default style; see https://github.com/necolas/normalize.css/issues/214
   border: 1px solid @input-border;
   border-radius: @input-border-radius;
   .box-shadow(inset 0 1px 1px rgba(0,0,0,.075));
diff --git a/less/navs.less b/less/navs.less
index 868aeb817..27861f8f4 100644
--- a/less/navs.less
+++ b/less/navs.less
@@ -159,6 +159,7 @@
     float: none;
      > a {
       text-align: center;
+      margin-bottom: 5px;
     }
   }
 
@@ -166,6 +167,9 @@
     > li {
       display: table-cell;
       width: 1%;
+      > a {
+        margin-bottom: 0;
+      }
     }
   }
 }
@@ -173,14 +177,29 @@
 // Move borders to anchors instead of bottom of list
 .nav-tabs-justified {
   border-bottom: 0;
-  > li > a {
-    border-bottom: 1px solid @nav-tabs-justified-link-border-color;
 
+  > li > a {
     // Override margin from .nav-tabs
     margin-right: 0;
+    border-radius: @border-radius-base;
+  }
+
+  > .active > a,
+  > .active > a:hover,
+  > .active > a:focus {
+    border: 1px solid @nav-tabs-justified-link-border-color;
   }
-  > .active > a {
-    border-bottom-color: @nav-tabs-justified-active-link-border-color;
+
+  @media (min-width: @screen-sm-min) {
+    > li > a {
+      border-bottom: 1px solid @nav-tabs-justified-link-border-color;
+      border-radius: @border-radius-base @border-radius-base 0 0;
+    }
+    > .active > a,
+    > .active > a:hover,
+    > .active > a:focus {
+      border-bottom-color: @nav-tabs-justified-active-link-border-color;
+    }
   }
 }
 
diff --git a/less/scaffolding.less b/less/scaffolding.less
index 53e1be5ac..046eb774a 100644
--- a/less/scaffolding.less
+++ b/less/scaffolding.less
@@ -37,17 +37,6 @@ textarea {
   line-height: inherit;
 }
 
-// Reset unusual Firefox-on-Android default style.
-//
-// See https://github.com/necolas/normalize.css/issues/214
-
-button,
-input,
-select[multiple],
-textarea {
-  background-image: none;
-}
-
 
 // Links
 
diff --git a/less/thumbnails.less b/less/thumbnails.less
index 1adee9e35..a210cac72 100644
--- a/less/thumbnails.less
+++ b/less/thumbnails.less
@@ -7,6 +7,7 @@
 .thumbnail {
   .img-thumbnail();
   display: block; // Override the inline-block from `.img-thumbnail`
+  margin-bottom: @line-height-computed;
 
   > img {
     .img-responsive();
diff --git a/less/type.less b/less/type.less
index b0423e982..6e0b74e13 100644
--- a/less/type.less
+++ b/less/type.less
@@ -25,7 +25,8 @@ p {
 // -------------------------
 
 // Ex: 14px base font * 85% = about 12px
-small   { font-size: 85%; }
+small,
+.small  { font-size: 85%; }
 
 // Undo browser default styling
 cite    { font-style: normal; }
diff --git a/less/variables.less b/less/variables.less
index 8927d70ff..14b6e3132 100644
--- a/less/variables.less
+++ b/less/variables.less
@@ -301,13 +301,6 @@
 @navbar-inverse-brand-hover-color:          #fff;
 @navbar-inverse-brand-hover-bg:             transparent;
 
-// Inverted navbar search
-// Normal navbar needs no special styles or vars
-@navbar-inverse-search-bg:                  lighten(@navbar-inverse-bg, 25%);
-@navbar-inverse-search-bg-focus:            #fff;
-@navbar-inverse-search-border:              @navbar-inverse-bg;
-@navbar-inverse-search-placeholder-color:   #ccc;
-
 // Inverted navbar toggle
 @navbar-inverse-toggle-hover-bg:            #333;
 @navbar-inverse-toggle-icon-bar-bg:         #fff;