Commit 858cb742 authored by Jose Ivan Vargas's avatar Jose Ivan Vargas

Merge branch 'ph/330874/removeWhitespaceFromInlineDiffs' into 'master'

Removes whitespace at bottom of inline diffs

See merge request gitlab-org/gitlab!68528
parents e8422176 a637cf59
...@@ -133,7 +133,10 @@ export default { ...@@ -133,7 +133,10 @@ export default {
<template> <template>
<div <div
:class="[$options.userColorScheme, { inline, 'with-codequality': hasCodequalityChanges }]" :class="[
$options.userColorScheme,
{ 'inline-diff-view': inline, 'with-codequality': hasCodequalityChanges },
]"
:data-commit-id="commitId" :data-commit-id="commitId"
class="diff-grid diff-table code diff-wrap-lines js-syntax-highlight text-file" class="diff-grid diff-table code diff-wrap-lines js-syntax-highlight text-file"
@mousedown="handleParallelLineMouseDown" @mousedown="handleParallelLineMouseDown"
......
...@@ -613,7 +613,7 @@ table.code { ...@@ -613,7 +613,7 @@ table.code {
grid-template-columns: 1fr 1fr; grid-template-columns: 1fr 1fr;
} }
&.inline { &.inline-diff-view {
.diff-grid-comments { .diff-grid-comments {
display: grid; display: grid;
grid-template-columns: 1fr; grid-template-columns: 1fr;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment