Skip to content
代码片段 群组 项目
未验证 提交 c80b8366 编辑于 作者: Coung Ngo's avatar Coung Ngo 提交者: GitLab
浏览文件

Merge branch 'merge-request-list-safari' into 'master'

Fix merge request list icon alignment in Safari

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/159788



Merged-by: default avatarCoung Ngo <cngo@gitlab.com>
Approved-by: default avatarJulia Miocene <jmiocene@gitlab.com>
Approved-by: default avatarVitaly Slobodin <vslobodin@gitlab.com>
Approved-by: default avatarCoung Ngo <cngo@gitlab.com>
Co-authored-by: default avatarAnnabel Dunstone Gray <annabel.dunstone@gmail.com>
No related branches found
No related tags found
无相关合并请求
...@@ -22,25 +22,26 @@ ...@@ -22,25 +22,26 @@
.issuable-info .issuable-info
%span.issuable-reference.gl-inline-block %span.issuable-reference.gl-inline-block
#{issuable_reference(merge_request)} #{issuable_reference(merge_request)}
%span.issuable-authored.gl-inline-block.gl-text-gray-500! %span.gl-hidden.sm:gl-inline
&middot; %span.issuable-authored.gl-inline-block.gl-text-gray-500!
#{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(merge_request.created_at, placement: 'bottom'), user: link_to_member(merge_request.author, avatar: false, extra_class: 'gl-text-gray-500!') }} &middot;
- if merge_request.milestone #{s_('IssueList|created %{timeAgoString} by %{user}').html_safe % { timeAgoString: time_ago_with_tooltip(merge_request.created_at, placement: 'bottom'), user: link_to_member(merge_request.author, avatar: false, extra_class: 'gl-text-gray-500!') }}
%span.issuable-milestone.gl-inline-block - if merge_request.milestone
&nbsp; %span.issuable-milestone.gl-inline-block
= link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), class: 'gl-text-gray-500!', data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do &nbsp;
= sprite_icon('milestone', size: 12, css_class: 'gl-vertical-align-text-bottom') = link_to project_merge_requests_path(merge_request.project, milestone_title: merge_request.milestone.title), class: 'gl-text-gray-500!', data: { html: 'true', toggle: 'tooltip', title: milestone_tooltip_due_date(merge_request.milestone) } do
= merge_request.milestone.title = sprite_icon('milestone', size: 12, css_class: 'gl-vertical-align-text-bottom')
- if merge_request.target_project.default_branch != merge_request.target_branch = merge_request.milestone.title
%span.project-ref-path.has-tooltip.gl-inline-block{ title: _('Target branch: %{target_branch}') % {target_branch: merge_request.target_branch} } - if merge_request.target_project.default_branch != merge_request.target_branch
&nbsp; %span.project-ref-path.has-tooltip.gl-inline-block.gl-text-truncate.gl-max-w-26.gl-align-bottom{ title: _('Target branch: %{target_branch}') % {target_branch: merge_request.target_branch} }
= link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name gl-text-gray-500!' do &nbsp;
= sprite_icon('branch', size: 12, css_class: 'fork-sprite') = link_to project_ref_path(merge_request.project, merge_request.target_branch), class: 'ref-name gl-text-gray-500!' do
= merge_request.target_branch = sprite_icon('branch', size: 12, css_class: 'fork-sprite')
- if merge_request.labels.any? = merge_request.target_branch
.gl-mt-2.gl-flex.gl-flex-wrap.gl-gap-2{ role: 'group', 'aria-label': _('Labels') } - if merge_request.labels.any?
- presented_labels_sorted_by_title(merge_request.labels, merge_request.project).each do |label| .gl-mt-2.gl-flex.gl-flex-wrap.gl-gap-2{ role: 'group', 'aria-label': _('Labels') }
= link_to_label(label, type: :merge_request) - presented_labels_sorted_by_title(merge_request.labels, merge_request.project).each do |label|
= link_to_label(label, type: :merge_request)
.gl-font-sm.gl-flex.gl-flex-shrink-0.gl-align-self-start.gl-gap-1.gl-flex-direction-row.gl-justify-content-space-between.gl-w-full.gl-md-w-auto{ class: 'gl-md-flex-direction-column!' } .gl-font-sm.gl-flex.gl-flex-shrink-0.gl-align-self-start.gl-gap-1.gl-flex-direction-row.gl-justify-content-space-between.gl-w-full.gl-md-w-auto{ class: 'gl-md-flex-direction-column!' }
%ul.controls.gl-gap-3.gl-pl-0.gl-align-self-end %ul.controls.gl-gap-3.gl-pl-0.gl-align-self-end
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册