diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-20 23:04:32 +0300 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-02-20 23:04:32 +0300 |
| commit | ee0a007f8f47ba1c8117f2e9130663461181a145 (patch) | |
| tree | 784b30bb94f19f97950e6e55e760dd2fb0869f1e | |
| parent | e0fc809b2697d06cb89e9d6acbb9339e36ef59e7 (diff) | |
| parent | deafa368812f2e1416a3c266a5d7f4065ad68896 (diff) | |
Merge branch '39010-add-left-margin-to-1st-time-contributor-badge' into 'master'
fix #39010 - add left margin to 1st time contributor badge
Closes #39010
See merge request gitlab-org/gitlab-ce!25216
| -rw-r--r-- | app/helpers/issuables_helper.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/39010-add-left-margin-to-1st-time-contributor-badge.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index 1a471034972..af28e6fcb93 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -200,7 +200,7 @@ module IssuablesHelper author_output end - 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 prepend-left-4', 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 prepend-left-8") output << content_tag(:span, (issuable.task_status_short if issuable.tasks?), id: "task_status_short", class: "d-md-none") diff --git a/changelogs/unreleased/39010-add-left-margin-to-1st-time-contributor-badge.yml b/changelogs/unreleased/39010-add-left-margin-to-1st-time-contributor-badge.yml new file mode 100644 index 00000000000..758b97deb3b --- /dev/null +++ b/changelogs/unreleased/39010-add-left-margin-to-1st-time-contributor-badge.yml @@ -0,0 +1,5 @@ +--- +title: Add left margin to 1st time contributor badge +merge_request: 25216 +author: Gokhan Apaydin +type: fixed |