Commit 17697e90 authored by Martin Wortschack's avatar Martin Wortschack

keeps margin for user status emojis consistent

- adds extra margin to the user-status-emoji
- removes whitespaces from the issable_meta helper
parent 46494f46
...@@ -701,6 +701,15 @@ ...@@ -701,6 +701,15 @@
align-self: center; align-self: center;
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
.user-status-emoji {
margin: 0 8px 0 4px;
gl-emoji {
font-size: 1em;
line-height: 1;
}
}
} }
.js-issuable-selector-wrap { .js-issuable-selector-wrap {
......
...@@ -195,6 +195,15 @@ ...@@ -195,6 +195,15 @@
word-break: break-all; word-break: break-all;
} }
.user-status-emoji {
margin-right: 4px;
gl-emoji {
font-size: 1em;
line-height: 1;
}
}
.member-group-link { .member-group-link {
display: inline-block; display: inline-block;
} }
......
...@@ -421,6 +421,15 @@ ul.notes { ...@@ -421,6 +421,15 @@ ul.notes {
&.discussion { &.discussion {
padding-bottom: 0; padding-bottom: 0;
} }
.user-status-emoji {
margin-right: 4px;
gl-emoji {
font-size: 1em;
line-height: 1;
}
}
} }
.system-note .note-header-info { .system-note .note-header-info {
......
...@@ -174,13 +174,12 @@ module IssuablesHelper ...@@ -174,13 +174,12 @@ module IssuablesHelper
author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-block d-sm-none") author_output << link_to_member(project, issuable.author, size: 24, by_username: true, avatar: false, mobile_classes: "d-block d-sm-none")
if status = user_status(issuable.author) if status = user_status(issuable.author)
author_output << "&ensp; #{status}".html_safe author_output << "#{status}".html_safe
end end
author_output author_output
end end
output << "&ensp;".html_safe
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")
......
---
title: Make margin of user status emoji consistent
merge_request:
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