Commit 70c347f0 authored by Phil Hughes's avatar Phil Hughes

Merge branch 'winh-label-action-dropdown' into 'master'

Make label actions dropdown style consistent

See merge request !13478
parents fd54a467 fde951b8
...@@ -804,6 +804,15 @@ ...@@ -804,6 +804,15 @@
#{$selector}.dropdown-menu-align-right { #{$selector}.dropdown-menu-align-right {
margin-top: 2px; margin-top: 2px;
} }
.open {
#{$selector}.dropdown-menu,
#{$selector}.dropdown-menu-nav {
@media (max-width: $screen-xs-max) {
max-width: 100%;
}
}
}
} }
@include new-style-dropdown('.js-namespace-select + '); @include new-style-dropdown('.js-namespace-select + ');
...@@ -116,6 +116,8 @@ ...@@ -116,6 +116,8 @@
} }
.manage-labels-list { .manage-labels-list {
@include new-style-dropdown;
> li:not(.empty-message):not(.is-not-draggable) { > li:not(.empty-message):not(.is-not-draggable) {
background-color: $white-light; background-color: $white-light;
cursor: move; cursor: move;
......
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
%ul %ul
%li %li
= link_to_label(label, subject: subject, type: :merge_request) do = link_to_label(label, subject: subject, type: :merge_request) do
view merge requests View merge requests
%li %li
= link_to_label(label, subject: subject) do = link_to_label(label, subject: subject) do
view open issues View open issues
- if current_user - if current_user
%li.label-subscription %li.label-subscription
- if can_subscribe_to_label_in_different_levels?(label) - if can_subscribe_to_label_in_different_levels?(label)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment