Merge pull request #11928 from twbs/we_have_to_go_back_kate

Follow up to reverted commits

3 files changed, 27 insertions, 24 deletions

diff --git a/less/breadcrumbs.less b/less/breadcrumbs.less
index a044c4c80..cb01d503f 100644
--- a/less/breadcrumbs.less
+++ b/less/breadcrumbs.less
@@ -9,14 +9,17 @@
   list-style: none;
   background-color: @breadcrumb-bg;
   border-radius: @border-radius-base;
+
   > li {
-    display: inline;
+    display: inline-block;
+
     + li:before {
       content: "@{breadcrumb-separator}\00a0"; // Unicode space added since inline-block means non-collapsing white-space
       padding: 0 5px;
       color: @breadcrumb-color;
     }
   }
+
   > .active {
     color: @breadcrumb-active-color;
   }
diff --git a/less/buttons.less b/less/buttons.less
index 68664ea5c..b728f332c 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -18,32 +18,32 @@
   white-space: nowrap;
   .button-size(@padding-base-vertical; @padding-base-horizontal; @font-size-base; @line-height-base; @border-radius-base);
   .user-select(none);
-}
 
-.btn:focus {
-  .tab-focus();
-}
+  &:focus {
+    .tab-focus();
+  }
 
-.btn:hover,
-.btn:focus {
-  color: @btn-default-color;
-  text-decoration: none;
-}
+  &:hover,
+  &:focus {
+    color: @btn-default-color;
+    text-decoration: none;
+  }
 
-.btn:active,
-.btn.active {
-  outline: 0;
-  background-image: none;
-  .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
-}
+  &:active,
+  &.active {
+    outline: 0;
+    background-image: none;
+    .box-shadow(inset 0 3px 5px rgba(0,0,0,.125));
+  }
 
-.btn.disabled,
-.btn[disabled],
-fieldset[disabled] .btn {
-  cursor: not-allowed;
-  pointer-events: none; // Future-proof disabling of clicks
-  .opacity(.65);
-  .box-shadow(none);
+  &.disabled,
+  &[disabled],
+  fieldset[disabled] & {
+    cursor: not-allowed;
+    pointer-events: none; // Future-proof disabling of clicks
+    .opacity(.65);
+    .box-shadow(none);
+  }
 }
 
 
diff --git a/less/navbar.less b/less/navbar.less
index dd9d55920..621772fbb 100644
--- a/less/navbar.less
+++ b/less/navbar.less
@@ -215,7 +215,7 @@
 // Builds on top of the `.nav` components with its own modifier class to make
 // the nav the full height of the horizontal nav (above 768px).
 
-.navbar .nav {
+.navbar-nav {
   margin: (@navbar-padding-vertical / 2) -@navbar-padding-horizontal;
 
   > li > a {