Commit a3a4a5af authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch '51412-username-alignment-issue-on-mr-page' into 'master'

Resolve "Username alignment issue on MR page"

Closes #51412

See merge request gitlab-org/gitlab-ce!21697
parents 197beefc 0daee834
...@@ -703,7 +703,8 @@ ...@@ -703,7 +703,8 @@
text-overflow: ellipsis; text-overflow: ellipsis;
.user-status-emoji { .user-status-emoji {
margin: 0 $gl-padding-8 0 $gl-padding-4; margin-left: $gl-padding-4;
margin-right: 0;
} }
} }
......
...@@ -191,7 +191,7 @@ module IssuablesHelper ...@@ -191,7 +191,7 @@ module IssuablesHelper
output << content_tag(:span, (issuable_first_contribution_icon if issuable.first_contribution?), class: 'has-tooltip', title: _('1st contribution!')) output << content_tag(:span, (issuable_first_contribution_icon if issuable.first_contribution?), class: 'has-tooltip', title: _('1st contribution!'))
output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block") output << content_tag(:span, (issuable.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block prepend-left-8")
output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none") output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none")
output.join.html_safe output.join.html_safe
......
---
title: Add margin between username and subsequent text in issuable header
merge_request: 21697
author:
type: other
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