diff options
author | Jacob Schatz <jschatz@gitlab.com> | 2016-08-25 19:44:19 +0000 |
---|---|---|
committer | Jacob Schatz <jschatz@gitlab.com> | 2016-08-25 19:44:19 +0000 |
commit | 71402f05166c1b89d1c928ea9fc2d0500f170dd1 (patch) | |
tree | 8bddced514416d6eaf7b3d52e32c626dc1b8982d /builds | |
parent | b3a14fe2ddfcc2839afa18fe787361734a646966 (diff) | |
parent | 5ab8977f183f15d3c638f5dfcfb2ac484c862124 (diff) | |
download | gitlab-ce-71402f05166c1b89d1c928ea9fc2d0500f170dd1.tar.gz |
Merge branch 'fix-emoji-alignment' into 'master'
Fix inline emoji text alignment
## What does this MR do?
Changes the vertical alignment of inline emoji text from `middle` to `top`
## Are there points in the code the reviewer needs to double check?
Potential emoji side effects (I couldn't find any)
## Why was this MR needed?
Fixes UI inconsistency
## What are the relevant issue numbers?
Closes #21403
## Screenshots (if relevant)
Before:
![Screen_Shot_2016-08-25_at_9.57.41_AM](/uploads/b7ce1da8d0eaaea3391502238a92fc77/Screen_Shot_2016-08-25_at_9.57.41_AM.png)
After:
![Screen_Shot_2016-08-25_at_9.57.49_AM](/uploads/8649c14764c3f616c487be115505c49a/Screen_Shot_2016-08-25_at_9.57.49_AM.png)
## Does this MR meet the acceptance criteria?
- [x] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added
- Tests
- [x] All builds are passing
- [x] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [x] Branch has no merge conflicts with `master` (if you do - rebase it please)
- [x] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)
See merge request !6027
Diffstat (limited to 'builds')
0 files changed, 0 insertions, 0 deletions