Commit 35014fa3 authored by Martin Wortschack's avatar Martin Wortschack

Merge branch '259060-align-badge-in-mr-list' into 'master'

Align badge with avatar in MR List

See merge request gitlab-org/gitlab!44671
parents dc7ffcc8 707e99a6
...@@ -471,12 +471,6 @@ $mr-widget-min-height: 69px; ...@@ -471,12 +471,6 @@ $mr-widget-min-height: 69px;
flex: 1; flex: 1;
} }
.issuable-meta {
.author-link {
display: inline-block;
}
}
.merge-request-title { .merge-request-title {
margin-bottom: 2px; margin-bottom: 2px;
......
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
= link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do
= sprite_icon('warning-solid') = sprite_icon('warning-solid')
- if merge_request.assignees.any? - if merge_request.assignees.any?
%li.gl-display-flex %li.gl-display-flex.gl-align-items-center
= render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request
- if Feature.enabled?(:merge_request_reviewers, @project) && merge_request.reviewers.any? - if Feature.enabled?(:merge_request_reviewers, @project) && merge_request.reviewers.any?
%li.gl-display-flex.issuable-reviewers %li.gl-display-flex.issuable-reviewers
......
---
title: Align badge with avatar in MR List
merge_request: 44671
author:
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment