From c1b374a70861b522256ff5ac8b5a5db2b6ebc681 Mon Sep 17 00:00:00 2001
From: Annabel Dunstone Gray <annabel.dunstone@gmail.com>
Date: Wed, 17 Jan 2018 10:58:45 -0700
Subject: [PATCH] Remove hover states from disabled buttons

---
 app/assets/stylesheets/framework/buttons.scss | 32 +++++++++----------
 .../26296-update-styling-disabled-buttons.yml |  5 +++
 2 files changed, 21 insertions(+), 16 deletions(-)
 create mode 100644 changelogs/unreleased/26296-update-styling-disabled-buttons.yml

diff --git a/app/assets/stylesheets/framework/buttons.scss b/app/assets/stylesheets/framework/buttons.scss
index 5cb34a0771d..160745ad8f5 100644
--- a/app/assets/stylesheets/framework/buttons.scss
+++ b/app/assets/stylesheets/framework/buttons.scss
@@ -220,14 +220,6 @@
     @include btn-with-margin;
   }
 
-  &.disabled {
-    pointer-events: auto !important;
-  }
-
-  &[disabled] {
-    pointer-events: none !important;
-  }
-
   .fa-caret-down,
   .fa-chevron-down {
     margin-left: 5px;
@@ -451,19 +443,27 @@
   @include btn-svg;
 }
 
-// All disabled buttons, regardless of color
+// All disabled buttons, regardless of color, type, etc
+%disabled {
+  background-color: $gray-light !important;
+  border-color: $theme-gray-200 !important;
+  color: $gl-text-color-disabled !important;
+  opacity: 1 !important;
+  cursor: not-allowed !important;
+
+  i {
+    color: $gl-text-color-disabled !important;
+  }
+}
+
 .btn.disabled,
 .btn[disabled],
 fieldset[disabled] .btn,
 .dropdown-toggle[disabled],
 [disabled].dropdown-menu-toggle {
-  background-color: $gray-light;
-  border-color: $theme-gray-200;
-  color: $gl-text-color-disabled;
-  opacity: 1;
-  cursor: not-allowed;
+  @extend %disabled;
 
-  i {
-    color: $gl-text-color-disabled;
+  &:hover {
+    @extend %disabled;
   }
 }
diff --git a/changelogs/unreleased/26296-update-styling-disabled-buttons.yml b/changelogs/unreleased/26296-update-styling-disabled-buttons.yml
new file mode 100644
index 00000000000..5fa109d75e0
--- /dev/null
+++ b/changelogs/unreleased/26296-update-styling-disabled-buttons.yml
@@ -0,0 +1,5 @@
+---
+title: Set standard disabled state for all buttons
+merge_request:
+author:
+type: other
-- 
GitLab