diff options
| author | Phil Hughes <me@iamphill.com> | 2017-09-04 07:28:29 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-09-04 07:28:29 +0000 |
| commit | 70c347f01a6298af3937e4057ef6a2675e92510f (patch) | |
| tree | 99da957223e2bf66967ebb93aa470df5cc4e1f5b | |
| parent | fd54a4678f23c9e18ce46b3803e5e57ffa1199a3 (diff) | |
| parent | fde951b8dcb61625df5fc0d3144154fd93d3ea76 (diff) | |
| download | gitlab-ce-70c347f01a6298af3937e4057ef6a2675e92510f.tar.gz | |
Merge branch 'winh-label-action-dropdown' into 'master'
Make label actions dropdown style consistent
See merge request !13478
| -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 1c40c7155c1..8872dec4c37 100644 --- a/app/assets/stylesheets/framework/dropdowns.scss +++ b/app/assets/stylesheets/framework/dropdowns.scss @@ -804,6 +804,15 @@ #{$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%; + } + } + } } @include new-style-dropdown('.js-namespace-select + '); 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) |