diff options
| author | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-29 10:35:26 +0100 |
|---|---|---|
| committer | Luke Bennett <lukeeeebennettplus@gmail.com> | 2018-05-29 10:35:26 +0100 |
| commit | 4a1d19a61d1c3d8908487dfc4a30b6962206a21b (patch) | |
| tree | f61ad40847b0ab54139aae3f7e36691beb1aa497 /app/views/shared/_label.html.haml | |
| parent | 5e5828a41a95e06e7aa66368efbd296846aa1e8b (diff) | |
| download | gitlab-ce-4a1d19a61d1c3d8908487dfc4a30b6962206a21b.tar.gz | |
Tidy tooltip_title and fix dropdown open left
Diffstat (limited to 'app/views/shared/_label.html.haml')
| -rw-r--r-- | app/views/shared/_label.html.haml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/views/shared/_label.html.haml b/app/views/shared/_label.html.haml index d8ab63e053c..296988ddddf 100644 --- a/app/views/shared/_label.html.haml +++ b/app/views/shared/_label.html.haml @@ -6,7 +6,7 @@ - toggle_subscription_path = toggle_subscription_label_path(label, @project) if current_user - show_label_merge_requests_link = show_label_issuables_link?(label, :merge_requests, project: @project) - show_label_issues_link = show_label_issuables_link?(label, :issues, project: @project) -- tooltip_title = label_status_tooltip(status) +- tooltip_title = label_status_tooltip(label, status) if status %li.label-list-item{ id: label_css_id, data: { id: label.id } } = render "shared/label_row", label: label, subject: subject, force_priority: force_priority @@ -29,7 +29,7 @@ .dropdown %button{ type: 'button', class: 'btn btn-transparent js-label-options-dropdown label-action', data: { toggle: 'dropdown' } } = sprite_icon('ellipsis_v') - .dropdown-menu.dropdown-menu-align-right + .dropdown-menu.dropdown-open-left %ul - if label.is_a?(ProjectLabel) && label.project.group && can?(current_user, :admin_label, label.project.group) %li @@ -55,7 +55,7 @@ %span = _('Subscribe') = sprite_icon('chevron-down') - .dropdown-menu.dropdown-menu-align-right + .dropdown-menu.dropdown-open-left %ul %li %button.js-subscribe-button.label-subscribe-button.btn.btn-default{ class: ('hidden' unless status.unsubscribed?), data: { status: status, url: toggle_subscription_project_label_path(@project, label) } } |