diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-07 01:50:24 +0300 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-07 01:50:24 +0300 |
| commit | 13202722c8f20e0c7ef1d51e374c79776e43c466 (patch) | |
| tree | e639d19bbce1488c1b03c87cd7f8a5342c5fe24c | |
| parent | 07c031338a5e9cdeb69bb562179ac675cfe9c960 (diff) | |
| parent | 290512db5b09d67447b7c984fc47f1c896400885 (diff) | |
Merge branch '49644-make-margin-of-user-status-emoji-consistent' into 'master'
Resolve "Make margin of user status emoji consistent"
Closes #49644
See merge request gitlab-org/gitlab-ce!21268
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 4 | ||||
| -rw-r--r-- | app/helpers/issuables_helper.rb | 3 | ||||
| -rw-r--r-- | changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml | 5 |
4 files changed, 20 insertions, 2 deletions
diff --git a/app/assets/stylesheets/framework/emojis.scss b/app/assets/stylesheets/framework/emojis.scss index 6c50ea719d3..be85e03430e 100644 --- a/app/assets/stylesheets/framework/emojis.scss +++ b/app/assets/stylesheets/framework/emojis.scss @@ -6,3 +6,13 @@ gl-emoji { font-size: 1.4em; line-height: 1em; } + +.user-status-emoji { + margin-right: $gl-padding-4; + + gl-emoji { + font-size: 1em; + line-height: 16px; + vertical-align: baseline; + } +} diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 9ac47a771a5..cb29b5d4313 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -701,6 +701,10 @@ align-self: center; overflow: hidden; text-overflow: ellipsis; + + .user-status-emoji { + margin: 0 $gl-padding-8 0 $gl-padding-4; + } } .js-issuable-selector-wrap { diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb index c84ed8091c3..79449a30305 100644 --- a/app/helpers/issuables_helper.rb +++ b/app/helpers/issuables_helper.rb @@ -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") if status = user_status(issuable.author) - author_output << "  #{status}".html_safe + author_output << "#{status}".html_safe end author_output end - output << " ".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.task_status if issuable.tasks?), id: "task_status", class: "d-none d-sm-none d-md-inline-block") diff --git a/changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml b/changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml new file mode 100644 index 00000000000..a2ae582fb1c --- /dev/null +++ b/changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml @@ -0,0 +1,5 @@ +--- +title: Make margin of user status emoji consistent +merge_request: 21268 +author: +type: other |