Commit 77ca5b4f authored by Martin Wortschack's avatar Martin Wortschack

resolves MR discussions:

- adds MR# to changelog
- adds pixel variables for margin
- changes line-height for user-status-emoji
parent 17697e90
...@@ -703,11 +703,11 @@ ...@@ -703,11 +703,11 @@
text-overflow: ellipsis; text-overflow: ellipsis;
.user-status-emoji { .user-status-emoji {
margin: 0 8px 0 4px; margin: 0 $gl-padding-8 0 $gl-padding-4;
gl-emoji { gl-emoji {
font-size: 1em; font-size: 1em;
line-height: 1; line-height: 16px;
} }
} }
} }
......
...@@ -196,11 +196,11 @@ ...@@ -196,11 +196,11 @@
} }
.user-status-emoji { .user-status-emoji {
margin-right: 4px; margin-right: $gl-padding-4;
gl-emoji { gl-emoji {
font-size: 1em; font-size: 1em;
line-height: 1; line-height: 16px;
} }
} }
......
...@@ -427,7 +427,7 @@ ul.notes { ...@@ -427,7 +427,7 @@ ul.notes {
gl-emoji { gl-emoji {
font-size: 1em; font-size: 1em;
line-height: 1; line-height: 16px;
} }
} }
} }
......
--- ---
title: Make margin of user status emoji consistent title: Make margin of user status emoji consistent
merge_request: merge_request: 21268
author: author:
type: other type: other
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment