kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

resolves MR discussions:

Browse source 
- adds MR# to changelog
- adds pixel variables for margin
- changes line-height for user-status-emoji
This commit is contained in:
Martin Wortschack 2018-08-21 17:30:12 +02:00
parent 17697e90a2
commit 77ca5b4f12
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/stylesheets/pages/issuable.scss
View file

@ -703,11 +703,11 @@
text-overflow: ellipsis;
.user-status-emoji {
margin: 0 8px 0 4px;
margin: 0 $gl-padding-8 0 $gl-padding-4;
gl-emoji {
font-size: 1em;
line-height: 1;
line-height: 16px;
}
}
}

4
app/assets/stylesheets/pages/members.scss
View file

@ -196,11 +196,11 @@
}
.user-status-emoji {
margin-right: 4px;
margin-right: $gl-padding-4;
gl-emoji {
font-size: 1em;
line-height: 1;
line-height: 16px;
}
}

2
app/assets/stylesheets/pages/notes.scss
View file

@ -427,7 +427,7 @@ ul.notes {
gl-emoji {
font-size: 1em;
line-height: 1;
line-height: 16px;
}
}
}

2
changelogs/unreleased/49644-make-margin-of-user-status-emoji-consistent.yml
View file

@ -1,5 +1,5 @@
---
title: Make margin of user status emoji consistent
merge_request:
merge_request: 21268
author:
type: other