Commit 4fdacbc6 authored by Fatih Acet's avatar Fatih Acet

Merge branch 'small-emoji-adjustments' into 'master'

Various small emoji positioning adjustments

## What does this MR do?
It changes various emoticon related css rules with very small minor tweaks of 1 or 2 px

## Are there points in the code the reviewer needs to double check?
-

## Why was this MR needed?
aesthetics

## Screenshots (if relevant)
-


## Does this MR meet the acceptance criteria?

- [X] [Changelog entry](https://docs.gitlab.com/ce/development/changelog.html) added
- [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md)
- [ ] API support added
- Tests
  - [ ] Added for this feature/bug
  - [ ] All builds are passing
- [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html)
- [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides)
- [ ] Branch has no merge conflicts with `master` (if it does - rebase it please)
- [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits)

## What are the relevant issue numbers?
none

See merge request !7993
parents bcf407a2 fd87bf3c
.awards { .awards {
.emoji-icon { .emoji-icon {
width: 19px; width: 20px;
height: 19px; height: 20px;
} }
} }
...@@ -136,5 +136,6 @@ ...@@ -136,5 +136,6 @@
.award-control-icon { .award-control-icon {
color: $award-emoji-new-btn-icon-color; color: $award-emoji-new-btn-icon-color;
margin-top: 1px;
} }
} }
...@@ -255,6 +255,7 @@ img.emoji { ...@@ -255,6 +255,7 @@ img.emoji {
height: 20px; height: 20px;
vertical-align: top; vertical-align: top;
width: 20px; width: 20px;
margin-top: 1px;
} }
.chart { .chart {
......
...@@ -413,7 +413,6 @@ ul.notes { ...@@ -413,7 +413,6 @@ ul.notes {
.fa { .fa {
color: $notes-action-color; color: $notes-action-color;
position: relative; position: relative;
top: 1px;
font-size: 17px; font-size: 17px;
} }
......
---
title: Various small emoji positioning adjustments
merge_request:
author:
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