diff options
| author | Phil Hughes <me@iamphill.com> | 2018-07-05 14:21:36 +0300 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2018-07-05 17:44:56 +0300 |
| commit | c9e225488af5a405ae9817d932aab908cb3fea2f (patch) | |
| tree | fe33e1590dbb89e0c22cb87c0f49839af57334f3 /app | |
| parent | acfdcca4ba18573d854dc1797042a33da9073013 (diff) | |
fixed where the scrollbar is shown in the merge request panel
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/ide/components/merge_requests/info.vue | 4 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 7 |
2 files changed, 7 insertions, 4 deletions
diff --git a/app/assets/javascripts/ide/components/merge_requests/info.vue b/app/assets/javascripts/ide/components/merge_requests/info.vue index fba287916dd..199d2e74971 100644 --- a/app/assets/javascripts/ide/components/merge_requests/info.vue +++ b/app/assets/javascripts/ide/components/merge_requests/info.vue @@ -17,8 +17,8 @@ export default { </script> <template> - <div class="ide-merge-request-info"> - <div class="detail-page-header sticky-top bg-white"> + <div class="ide-merge-request-info h-100 d-flex flex-column"> + <div class="detail-page-header"> <icon name="git-merge" class="align-self-center append-right-8" diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 7e5b5092857..2261fbd7c1d 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -1331,9 +1331,12 @@ } .ide-merge-request-info { - overflow: auto; - .detail-page-header { line-height: initial; + height: 38px; + } + + .issuable-details { + overflow: auto; } } |