summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets/pages/notes.scss
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-12-08 19:20:00 +0000
committerFatih Acet <acetfatih@gmail.com>2016-12-08 19:20:00 +0000
commit4fdacbc62e776bba7adc80e6b2efd48978d76cdf (patch)
treec26fa12f062ba597c202995baca317e54e752c0b /app/assets/stylesheets/pages/notes.scss
parentbcf407a2f887d065e515912514a69da942220db5 (diff)
parentfd87bf3c2c4d3064a1a4eb1867d9a093172fed6e (diff)
downloadgitlab-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
Diffstat (limited to 'app/assets/stylesheets/pages/notes.scss')
-rw-r--r--app/assets/stylesheets/pages/notes.scss1
1 files changed, 0 insertions, 1 deletions
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;
}