summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-10 16:55:02 +0000
committerAnnabel Dunstone Gray <annabel.dunstone@gmail.com>2017-03-10 16:55:02 +0000
commitdaa4590ca3e64220bff1a4d94f9d1a5ddadf42fa (patch)
tree31410a1eecd4f6bd9250be18eb7b2c7a71741cbb
parentc8bbf9a896ff9d163e59a282906d9bde8e892dba (diff)
parent3c53f66c7e57269595f2f4d0cf872e948cd467fd (diff)
downloadgitlab-ce-29326-how-to-vue-architectural-decisions.tar.gz
Merge branch '29263-merge-button-color' into 'master' 29326-how-to-vue-architectural-decisions
Consistent button colors for disabled buttons Closes #29263 and #29221 See merge request !9848
-rw-r--r--app/assets/stylesheets/framework/dropdowns.scss2
-rw-r--r--app/assets/stylesheets/pages/merge_requests.scss4
-rw-r--r--changelogs/unreleased/29263-merge-button-color.yml4
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss
index fe8b37d2c6e..186bb9ac616 100644
--- a/app/assets/stylesheets/framework/dropdowns.scss
+++ b/app/assets/stylesheets/framework/dropdowns.scss
@@ -43,7 +43,7 @@
white-space: nowrap;
&[disabled] {
- background-color: $input-bg-disabled;
+ opacity: .65;
cursor: not-allowed;
}
diff --git a/app/assets/stylesheets/pages/merge_requests.scss b/app/assets/stylesheets/pages/merge_requests.scss
index d3496e19dde..7c3172421c1 100644
--- a/app/assets/stylesheets/pages/merge_requests.scss
+++ b/app/assets/stylesheets/pages/merge_requests.scss
@@ -24,10 +24,6 @@
color: inherit;
}
- .btn-success.dropdown-toggle:disabled {
- background-color: $gl-success;
- }
-
.accept-merge-request {
&.ci-pending,
&.ci-running {
diff --git a/changelogs/unreleased/29263-merge-button-color.yml b/changelogs/unreleased/29263-merge-button-color.yml
new file mode 100644
index 00000000000..2d0625483a4
--- /dev/null
+++ b/changelogs/unreleased/29263-merge-button-color.yml
@@ -0,0 +1,4 @@
+---
+title: ensure MR widget dropdown is same color as button
+merge_request:
+author: