From 0daee8341c78cbf52c05c85752643d606e526e31 Mon Sep 17 00:00:00 2001 From: Martin Wortschack Date: Fri, 14 Sep 2018 13:19:57 +0000 Subject: Resolve "Username alignment issue on MR page" --- app/assets/stylesheets/pages/issuable.scss | 3 ++- app/helpers/issuables_helper.rb | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index cb29b5d4313..57539212e0c 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -703,7 +703,8 @@ text-overflow: ellipsis; .user-status-emoji { - margin: 0 $gl-padding-8 0 $gl-padding-4; + margin-left: $gl-padding-4; + margin-right: 0; } } diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 1f67c045d1c..56f6686da57 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -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.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.join.html_safe -- cgit v1.2.3