diff options
| author | Clement Ho <ClemMakesApps@gmail.com> | 2017-08-04 14:27:44 +0200 |
|---|---|---|
| committer | Clement Ho <ClemMakesApps@gmail.com> | 2017-08-04 14:29:23 +0200 |
| commit | 9a7a46ac6dcfbe24e6c3a16302b2bc16ff70bab6 (patch) | |
| tree | 87fa377f8457c1971bc12b471a694f8a5ad5d17b | |
| parent | bbf2ef06eb25213a906159e28ec902c7ed9d6783 (diff) | |
| download | gitlab-ce-9a7a46ac6dcfbe24e6c3a16302b2bc16ff70bab6.tar.gz | |
Add fixed height to blob-viewer-container
| -rw-r--r-- | app/assets/javascripts/repo/components/repo.vue | 2 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue index 89ba5889dd0..ae659c399f9 100644 --- a/app/assets/javascripts/repo/components/repo.vue +++ b/app/assets/javascripts/repo/components/repo.vue @@ -49,7 +49,7 @@ export default { <repo-sidebar/><div class="panel-right" :class="{'edit-mode': editMode}"> <repo-tabs/> <repo-file-buttons/> - <component :is="currentBlobView"></component> + <component :is="currentBlobView" class="blob-viewer-container"></component> <!-- <repo-binary-viewer/> soon™ --> </div> <repo-commit-section/> diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 5c6de367e4d..e2a007e932d 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -93,6 +93,11 @@ } } + .blob-viewer-container { + height: calc(100vh - 83px); + overflow: auto; + } + #tabs { border-bottom: 1px solid $white-normal; padding-left: 0; |