diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-14 16:19:58 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-14 16:19:58 +0300 |
| commit | a3a4a5afede13c69d51536fa4eaeb1977b45a50b (patch) | |
| tree | 01153fc6c5d91b0e2ba5764ff295e754ba367a0e | |
| parent | 197beefc414c34ba9af89b91630f5d3137bf06de (diff) | |
| parent | 0daee8341c78cbf52c05c85752643d606e526e31 (diff) | |
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
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 3 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml | 5 |
3 files changed, 8 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 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 diff --git a/changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml b/changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml new file mode 100644 index 00000000000..5d245f672f2 --- /dev/null +++ b/changelogs/unreleased/51412-username-alignment-issue-on-mr-page.yml @@ -0,0 +1,5 @@ +--- +title: Add margin between username and subsequent text in issuable header +merge_request: 21697 +author: +type: other |