diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-25 09:53:42 -0500 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2016-08-25 09:53:42 -0500 |
| commit | 5ab8977f183f15d3c638f5dfcfb2ac484c862124 (patch) | |
| tree | d93861e5f4bd1fe43b2e153b137f16af419042c3 | |
| parent | a03da79fb2371ca0d866ce776bfb0bfe9f1be1df (diff) | |
| download | gitlab-ce-5ab8977f183f15d3c638f5dfcfb2ac484c862124.tar.gz | |
Fix inline emoji text alignment
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/framework/common.scss | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG b/CHANGELOG index 104f37003c9..9b79288e1bb 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,7 @@ v 8.12.0 (unreleased) - Add `wiki_page_events` to project hook APIs (Ben Boeckel) - Add Sentry logging to API calls - Added tests for diff notes + - Fix inline emoji text alignment (ClemMakesApps) - Added 'only_allow_merge_if_build_succeeds' project setting in the API. !5930 (Duck) - Reduce number of database queries on builds tab - Use the default branch for displaying the project icon instead of master !5792 (Hannes Rosenögger) diff --git a/app/assets/stylesheets/framework/common.scss b/app/assets/stylesheets/framework/common.scss index c1e5305644b..8984bce616c 100644 --- a/app/assets/stylesheets/framework/common.scss +++ b/app/assets/stylesheets/framework/common.scss @@ -248,7 +248,7 @@ li.note { img.emoji { height: 20px; - vertical-align: middle; + vertical-align: top; width: 20px; } |