diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-11 12:00:04 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-11 12:00:04 +0000 |
| commit | 47014348bfb59395d24daba56709b739a79b0cf3 (patch) | |
| tree | 08c566d389b7b12d7628c6844c2586beeacf782e | |
| parent | 06375c7e088022b648d70771d3d0a115667b711c (diff) | |
| download | gitlab-ce-issue-sidebar-labels-dropdown.tar.gz | |
Fixed issue when creating labels in dropdownissue-sidebar-labels-dropdown
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index a14d7c80188..61145a19481 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -33,7 +33,7 @@ class @LabelsSelect color: newColorField.val() }, (label) -> $('.js-new-label-btn').enable() - $('.dropdown-menu-back', $(dropdown).parent()).trigger "click" + $('.dropdown-menu-back', $(dropdown).parents('.dropdown')).trigger "click" $(dropdown).glDropdown( data: (term, callback) -> diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index d8625b31f65..125118b9d4f 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -243,7 +243,7 @@ } } - .btn { + .btn:not(.btn-primary) { background: $gray-normal; border: 1px solid $border-gray-normal; &:hover { |