diff options
| author | winh <winnie@gitlab.com> | 2017-08-10 21:59:26 +0200 |
|---|---|---|
| committer | winh <winnie@gitlab.com> | 2017-08-29 15:13:22 +0200 |
| commit | fde951b8dcb61625df5fc0d3144154fd93d3ea76 (patch) | |
| tree | dda8eeb3970040d1d1a9c3f4a663cced86bef7f4 | |
| parent | 6f0f65becbbe968bd26a5a3872044d7b8633bf2e (diff) | |
| download | gitlab-ce-winh-label-action-dropdown.tar.gz | |
Make label actions dropdown style consistentwinh-label-action-dropdown
| -rw-r--r-- | app/assets/stylesheets/framework/dropdowns.scss | 9 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/labels.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/_label.html.haml | 4 |
3 files changed, 13 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/dropdowns.scss b/app/assets/stylesheets/framework/dropdowns.scss index a45d5a6dca0..9548af7f4ef 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -791,4 +791,13 @@ #{$selector}.dropdown-menu-align-right { margin-top: 2px; } + + .open { + #{$selector}.dropdown-menu, + #{$selector}.dropdown-menu-nav { + @media (max-width: $screen-xs-max) { + max-width: 100%; + } + } + } } diff --git a/app/assets/stylesheets/pages/labels.scss b/app/assets/stylesheets/pages/labels.scss index ee48f7a3626..443f5500684 100644 --- a/app/assets/stylesheets/pages/labels.scss +++ b/app/assets/stylesheets/pages/labels.scss @@ -116,6 +116,8 @@ } .manage-labels-list { + @include new-style-dropdown; + > li:not(.empty-message):not(.is-not-draggable) { background-color: $white-light; cursor: move; diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index 8ded7440de3..23a418ad640 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -14,10 +14,10 @@ %ul %li = link_to_label(label, subject: subject, type: :merge_request) do - view merge requests + View merge requests %li = link_to_label(label, subject: subject) do - view open issues + View open issues - if current_user %li.label-subscription - if can_subscribe_to_label_in_different_levels?(label) |