summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2018-09-06 13:58:35 -0500
committerPaul Slaughter <pslaughter@gitlab.com>2018-09-06 14:23:41 -0500
commit908b8b712deb7ca368033fb828ec20cb4aa631cc (patch)
treeb3e9d666abdf03047aaa700e2127c126e652ceb9
parent607a2562380515ddb2909db9d0486b022342add9 (diff)
downloadgitlab-ce-908b8b712deb7ca368033fb828ec20cb4aa631cc.tar.gz
Fix vertical alignment of text in diffs
- Adds changelog
-rw-r--r--app/assets/stylesheets/pages/diff.scss1
-rw-r--r--changelogs/unreleased/48902-fix-diff-vertical-alignment.yml5
2 files changed, 6 insertions, 0 deletions
diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss
index d673b59e1c0..207c68432a7 100644
--- a/app/assets/stylesheets/pages/diff.scss
+++ b/app/assets/stylesheets/pages/diff.scss
@@ -72,6 +72,7 @@
.line_holder td {
line-height: $code-line-height;
font-size: $code-font-size;
+ vertical-align: top;
&.noteable_line {
position: relative;
diff --git a/changelogs/unreleased/48902-fix-diff-vertical-alignment.yml b/changelogs/unreleased/48902-fix-diff-vertical-alignment.yml
new file mode 100644
index 00000000000..75018d57e5b
--- /dev/null
+++ b/changelogs/unreleased/48902-fix-diff-vertical-alignment.yml
@@ -0,0 +1,5 @@
+---
+title: Fix vertical alignment of text in diffs
+merge_request: 21573
+author:
+type: fixed