From 43a25d93ebdabea52f99b05e15b06250cd8f07d7 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Wed, 17 May 2023 16:05:49 +0000 Subject: Add latest changes from gitlab-org/gitlab@16-0-stable-ee --- app/views/shared/_label_row.html.haml | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) (limited to 'app/views/shared/_label_row.html.haml') diff --git a/app/views/shared/_label_row.html.haml b/app/views/shared/_label_row.html.haml index c351ea29c7c..19489981d94 100644 --- a/app/views/shared/_label_row.html.haml +++ b/app/views/shared/_label_row.html.haml @@ -3,28 +3,25 @@ - show_label_issues_link = subject_or_group_defined && show_label_issuables_link?(label, :issues) - show_label_merge_requests_link = subject_or_group_defined && show_label_issuables_link?(label, :merge_requests) -.label-name.gl-flex-shrink-0.gl-mt-2.gl-mr-5 +.label-name.gl-flex-shrink-0.gl-mr-5 = render_label(label, tooltip: false) -.label-description.gl-overflow-hidden.gl-w-full - .gl-display-flex.gl-align-items-stretch.gl-flex-wrap.gl-mt-2 - .gl-flex-basis-half.gl-flex-grow-1.gl-overflow-hidden.gl-mr-5 + - if show_labels_full_path?(@project, @group) + .gl-mt-2 + = render 'shared/label_full_path', label: label +.label-description.gl-w-full + .gl-display-flex.gl-align-items-stretch.gl-flex-wrap + .gl-flex-basis-half.gl-flex-grow-1.gl-mr-5 - if label.description.present? - = markdown_field(label, :description) - - elsif show_labels_full_path?(@project, @group) - = render 'shared/label_full_path', label: label + .gl-my-1 + = markdown_field(label, :description) %ul.label-links.gl-m-0.gl-p-0.gl-white-space-nowrap + - if force_priority + %li.js-priority-badge.inline.gl-mr-3.gl-mt-1 + .label-badge.gl-bg-blue-50= _('Prioritized') - if show_label_issues_link - %li.inline - = link_to_label(label, css_class: 'gl-text-blue-600!') { _('Issues') } + %li.inline.gl-my-1 + = link_to_label(label, css_class: 'gl-mr-5') { _('Issues') } - if show_label_merge_requests_link - · - %li.inline - = link_to_label(label, type: :merge_request, css_class: 'gl-text-blue-600!') { _('Merge requests') } + %li.inline.gl-my-1 + = link_to_label(label, type: :merge_request) { _('Merge requests') } = render_if_exists 'shared/label_row_epics_link', label: label - - if force_priority - · - %li.js-priority-badge.inline.gl-ml-3 - .label-badge.gl-bg-blue-50= _('Prioritized label') - - if label.description.present? && show_labels_full_path?(@project, @group) - .gl-mt-3 - = render 'shared/label_full_path', label: label -- cgit v1.2.3