diff options
| author | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-08-19 12:56:11 +0000 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.m.gray@gmail.com> | 2019-08-19 12:56:11 +0000 |
| commit | b1905a396f7e7da89280aea4436eb7261d1cd34c (patch) | |
| tree | 7caafa91bed4f911765ada23df7606d94249146e /app | |
| parent | c90a10dc3121835ac3a9bf5ed8bf7879df2d3f4d (diff) | |
| parent | c0769b308a9df0de6374c480310c41c990bc7cc1 (diff) | |
| download | gitlab-ce-b1905a396f7e7da89280aea4436eb7261d1cd34c.tar.gz | |
Merge branch '63905-discussion-expand-collapse-button-is-only-clickable-on-one-side' into 'master'
Resolve "Discussion "expand"/"collapse" button is only clickable on one side"
Closes #63905
See merge request gitlab-org/gitlab-ce!31730
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/diffs/components/app.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/diff.scss | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue index 81da0754752..19b85710710 100644 --- a/app/assets/javascripts/diffs/components/app.vue +++ b/app/assets/javascripts/diffs/components/app.vue @@ -305,7 +305,7 @@ export default { <div v-show="showTreeList" :style="{ width: `${treeWidth}px` }" - class="diff-tree-list js-diff-tree-list" + class="diff-tree-list js-diff-tree-list mr-3" > <panel-resizer :size.sync="treeWidth" diff --git a/app/assets/stylesheets/pages/diff.scss b/app/assets/stylesheets/pages/diff.scss index ffb27e54f34..77a2fd6b876 100644 --- a/app/assets/stylesheets/pages/diff.scss +++ b/app/assets/stylesheets/pages/diff.scss @@ -1032,7 +1032,6 @@ table.code { $top-pos: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px; top: $header-height + $mr-tabs-height + $mr-version-controls-height + 10px; max-height: calc(100vh - #{$top-pos}); - padding-right: $gl-padding; z-index: 202; .with-performance-bar & { @@ -1043,7 +1042,7 @@ table.code { .drag-handle { bottom: 16px; - transform: translateX(-6px); + transform: translateX(10px); } } |