diff options
author | Fatih Acet <acetfatih@gmail.com> | 2016-12-08 19:20:00 +0000 |
---|---|---|
committer | Fatih Acet <acetfatih@gmail.com> | 2016-12-08 19:20:00 +0000 |
commit | 4fdacbc62e776bba7adc80e6b2efd48978d76cdf (patch) | |
tree | c26fa12f062ba597c202995baca317e54e752c0b | |
parent | bcf407a2f887d065e515912514a69da942220db5 (diff) | |
parent | fd87bf3c2c4d3064a1a4eb1867d9a093172fed6e (diff) | |
download | gitlab-ce-4fdacbc62e776bba7adc80e6b2efd48978d76cdf.tar.gz |
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
-rw-r--r-- | app/assets/stylesheets/framework/awards.scss | 5 | ||||
-rw-r--r-- | app/assets/stylesheets/framework/common.scss | 1 | ||||
-rw-r--r-- | app/assets/stylesheets/pages/notes.scss | 1 | ||||
-rw-r--r-- | changelogs/unreleased/small-emoji-adjustments.yml | 4 |
4 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/framework/awards.scss b/app/assets/stylesheets/framework/awards.scss index c13cb4a02b2..dece5c3202b 100644 --- a/app/assets/stylesheets/framework/awards.scss +++ b/app/assets/stylesheets/framework/awards.scss @@ -1,7 +1,7 @@ .awards { .emoji-icon { - width: 19px; - height: 19px; + width: 20px; + height: 20px; } } @@ -136,5 +136,6 @@ .award-control-icon { color: $award-emoji-new-btn-icon-color; + margin-top: 1px; } } diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index 600bf17259b..251e43d2edd 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -255,6 +255,7 @@ img.emoji { height: 20px; vertical-align: top; width: 20px; + margin-top: 1px; } .chart { diff --git a/app/assets/stylesheets/pages/notes.scss b/app/assets/stylesheets/pages/notes.scss index 16b099c09eb..30f41a37ab3 100644 --- a/app/assets/stylesheets/pages/notes.scss +++ b/app/assets/stylesheets/pages/notes.scss @@ -413,7 +413,6 @@ ul.notes { .fa { color: $notes-action-color; position: relative; - top: 1px; font-size: 17px; } diff --git a/changelogs/unreleased/small-emoji-adjustments.yml b/changelogs/unreleased/small-emoji-adjustments.yml new file mode 100644 index 00000000000..804bd05b613 --- /dev/null +++ b/changelogs/unreleased/small-emoji-adjustments.yml @@ -0,0 +1,4 @@ +--- +title: Various small emoji positioning adjustments +merge_request: +author: |