diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-10 17:01:49 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2018-09-10 17:01:49 +0000 |
| commit | 33e7e59dcbc568d7dbed6802e9eb71eed06c6bc0 (patch) | |
| tree | bce033e8f4ca09dea88c51a9f74df3b745ff9bab | |
| parent | df3bb676d2bde1c58bfced38e17cee7c1a57d69f (diff) | |
| parent | 908b8b712deb7ca368033fb828ec20cb4aa631cc (diff) | |
| download | gitlab-ce-33e7e59dcbc568d7dbed6802e9eb71eed06c6bc0.tar.gz | |
Merge branch '48902-fix-diff-vertical-alignment' into 'master'
Fix vertical alignment of text in diffs
Closes #48902
See merge request gitlab-org/gitlab-ce!21573
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/48902-fix-diff-vertical-alignment.yml | 5 |
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 |