diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 00:06:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-02 00:06:09 +0300 |
| commit | e0bd3a45d9dc6c74cac1a33ea8c03d6d8334249b (patch) | |
| tree | df0bb30b7f0e06cfd59bda5bcadb21bf75ea70cc /app/assets/javascripts/diffs | |
| parent | ed3b1698883bd4ac2c4faf6c05c3a8155748bf91 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/diffs')
| -rw-r--r-- | app/assets/javascripts/diffs/components/inline_diff_view.vue | 11 | ||||
| -rw-r--r-- | app/assets/javascripts/diffs/components/parallel_diff_view.vue | 13 |
2 files changed, 11 insertions, 13 deletions
diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue index aee01409db7..1eb17588376 100644 --- a/app/assets/javascripts/diffs/components/inline_diff_view.vue +++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue @@ -45,12 +45,11 @@ export default { :data-commit-id="commitId" class="code diff-wrap-lines js-syntax-highlight text-file js-diff-inline-view" > - <!-- Need to insert an empty row to solve "table-layout:fixed" equal width when expansion row is the first line --> - <tr> - <td style="width: 50px;"></td> - <td style="width: 50px;"></td> - <td></td> - </tr> + <colgroup> + <col style="width: 50px;" /> + <col style="width: 50px;" /> + <col /> + </colgroup> <tbody> <template v-for="(line, index) in diffLines"> <inline-diff-expansion-row diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue index d400eb2c586..88baac092a1 100644 --- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue +++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue @@ -45,13 +45,12 @@ export default { :data-commit-id="commitId" class="code diff-wrap-lines js-syntax-highlight text-file" > - <!-- Need to insert an empty row to solve "table-layout:fixed" equal width when expansion row is the first line --> - <tr> - <td style="width: 50px;"></td> - <td></td> - <td style="width: 50px;"></td> - <td></td> - </tr> + <colgroup> + <col style="width: 50px;" /> + <col /> + <col style="width: 50px;" /> + <col /> + </colgroup> <tbody> <template v-for="(line, index) in diffLines"> <parallel-diff-expansion-row |