diff options
| author | Mike Greiling <mike@pixelcog.com> | 2018-09-06 22:50:24 +0000 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2018-09-06 22:50:24 +0000 |
| commit | 13202722c8f20e0c7ef1d51e374c79776e43c466 (patch) | |
| tree | e639d19bbce1488c1b03c87cd7f8a5342c5fe24c /app/assets/stylesheets | |
| parent | 07c031338a5e9cdeb69bb562179ac675cfe9c960 (diff) | |
| parent | 290512db5b09d67447b7c984fc47f1c896400885 (diff) | |
| download | gitlab-ce-13202722c8f20e0c7ef1d51e374c79776e43c466.tar.gz | |
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
Diffstat (limited to 'app/assets/stylesheets')
| -rw-r--r-- | app/assets/stylesheets/framework/emojis.scss | 10 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 4 |
2 files changed, 14 insertions, 0 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 { |