Move hand cursor for buttons to reboot

6 files changed, 13 insertions, 18 deletions

diff --git a/scss/_buttons.scss b/scss/_buttons.scss
index 7c45534e00..16f9f67cca 100644
--- a/scss/_buttons.scss
+++ b/scss/_buttons.scss
@@ -34,11 +34,6 @@
     @include box-shadow(none);
   }
 
-  // Opinionated: add "hand" cursor to non-disabled .btn elements
-  &:not(:disabled):not(.disabled) {
-    cursor: pointer;
-  }
-
   &:not(:disabled):not(.disabled):active,
   &:not(:disabled):not(.disabled).active {
     @include box-shadow($btn-active-box-shadow);
diff --git a/scss/_close.scss b/scss/_close.scss
index 821922f4c4..ec6593a888 100644
--- a/scss/_close.scss
+++ b/scss/_close.scss
@@ -17,9 +17,6 @@
     @include hover-focus {
       opacity: .75;
     }
-
-    // Opinionated: add "hand" cursor to non-disabled .close elements
-    cursor: pointer;
   }
 }
 
diff --git a/scss/_navbar.scss b/scss/_navbar.scss
index b5bc5a9748..9344a245ad 100644
--- a/scss/_navbar.scss
+++ b/scss/_navbar.scss
@@ -116,11 +116,6 @@
   @include hover-focus {
     text-decoration: none;
   }
-
-  // Opinionated: add "hand" cursor to non-disabled .navbar-toggler elements
-  &:not(:disabled):not(.disabled) {
-    cursor: pointer;
-  }
 }
 
 // Keep as a separate element so folks can easily override it with another icon
diff --git a/scss/_pagination.scss b/scss/_pagination.scss
index 9349f3f900..b4345311d3 100644
--- a/scss/_pagination.scss
+++ b/scss/_pagination.scss
@@ -27,11 +27,6 @@
     outline: $pagination-focus-outline;
     box-shadow: $pagination-focus-box-shadow;
   }
-
-  // Opinionated: add "hand" cursor to non-disabled .page-link elements
-  &:not(:disabled):not(.disabled) {
-    cursor: pointer;
-  }
 }
 
 .page-item {
diff --git a/scss/_reboot.scss b/scss/_reboot.scss
index ebbc179012..de7a14371b 100644
--- a/scss/_reboot.scss
+++ b/scss/_reboot.scss
@@ -349,6 +349,18 @@ button,
   -webkit-appearance: button; // 2
 }
 
+// Opinionated: add "hand" cursor to non-disabled button elements.
+@if $enable-pointer-cursor-for-buttons {
+  button,
+  [type="button"],
+  [type="reset"],
+  [type="submit"] {
+    &:not(:disabled) {
+      cursor: pointer;
+    }
+  }
+}
+
 // Remove inner border and padding from Firefox, but don't restore the outline like Normalize.
 button::-moz-focus-inner,
 [type="button"]::-moz-focus-inner,
diff --git a/scss/_variables.scss b/scss/_variables.scss
index 2d5a5e67ff..30a69d7963 100644
--- a/scss/_variables.scss
+++ b/scss/_variables.scss
@@ -114,6 +114,7 @@ $enable-transitions:                          true !default;
 $enable-prefers-reduced-motion-media-query:   true !default;
 $enable-hover-media-query:                    false !default; // Deprecated, no longer affects any compiled CSS
 $enable-grid-classes:                         true !default;
+$enable-pointer-cursor-for-buttons:           true !default;
 $enable-print-styles:                         true !default;
 $enable-validation-icons:                     true !default;