Merge pull request #8410 from cvrebert/buttons-nesting

more nesting in buttons.less

2 files changed, 28 insertions, 29 deletions

diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css
index d3bea53f3..cad42745c 100644
--- a/docs/assets/css/bootstrap.css
+++ b/docs/assets/css/bootstrap.css
@@ -2074,6 +2074,13 @@ fieldset[disabled] .btn-info.active {
   border-color: #5bc0de;
 }
 
+.btn-link {
+  font-weight: normal;
+  color: #428bca;
+  cursor: pointer;
+  border-radius: 0;
+}
+
 .btn-link,
 .btn-link:active,
 .btn-link[disabled],
@@ -2091,13 +2098,6 @@ fieldset[disabled] .btn-link {
   border-color: transparent;
 }
 
-.btn-link {
-  font-weight: normal;
-  color: #428bca;
-  cursor: pointer;
-  border-radius: 0;
-}
-
 .btn-link:hover,
 .btn-link:focus {
   color: #2a6496;
diff --git a/less/buttons.less b/less/buttons.less
index 6280d3448..3cc7da00d 100644
--- a/less/buttons.less
+++ b/less/buttons.less
@@ -81,33 +81,32 @@
 // -------------------------
 
 // Make a button look and behave like a link
-.btn-link,
-.btn-link:active,
-.btn-link[disabled],
-fieldset[disabled] .btn-link {
-  background-color: transparent;
-  background-image: none;
-  .box-shadow(none);
-}
-.btn-link,
-.btn-link:hover,
-.btn-link:focus,
-.btn-link:active {
-  border-color: transparent;
-}
 .btn-link {
   color: @link-color;
   font-weight: normal;
   cursor: pointer;
   border-radius: 0;
-}
-.btn-link:hover,
-.btn-link:focus {
-  color: @link-hover-color;
-  text-decoration: underline;
-  background-color: transparent;
-}
-.btn-link {
+
+  &,
+  &:active,
+  &[disabled],
+  fieldset[disabled] & {
+    background-color: transparent;
+    background-image: none;
+    .box-shadow(none);
+  }
+  &,
+  &:hover,
+  &:focus,
+  &:active {
+    border-color: transparent;
+  }
+  &:hover,
+  &:focus {
+    color: @link-hover-color;
+    text-decoration: underline;
+    background-color: transparent;
+  }
   &[disabled],
   fieldset[disabled] & {
     &:hover,