diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-14 13:19:58 +0000 |
|---|---|---|
| committer | Jan Provaznik <jprovaznik@gitlab.com> | 2018-09-17 11:25:50 +0200 |
| commit | 6036835fac6d30ea3cd0e7d847d012570547331f (patch) | |
| tree | 3b92848d44d3d0d578ad4d77758dc1364d5a5f38 /app | |
| parent | a47033b0791f7d6f7442f284125c188894d0f578 (diff) | |
| download | gitlab-ce-6036835fac6d30ea3cd0e7d847d012570547331f.tar.gz | |
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
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 3 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 2 |
2 files changed, 3 insertions, 2 deletions
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 79449a30305..32fc56216c6 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -182,7 +182,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.html_safe |