diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-04 14:13:04 +0100 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-04 14:13:04 +0100 |
| commit | c41f64d7ff8ddcc47e0ab269accc33b4a2653a22 (patch) | |
| tree | 403787966a274b4fe13dcaae23e27495e396eaac | |
| parent | 03598ca79b02a949b1d6cc1e64a701be2b65581f (diff) | |
| parent | d64196fbf91ca898af3918ddbfc831d76e828900 (diff) | |
| download | gitlab-ce-c41f64d7ff8ddcc47e0ab269accc33b4a2653a22.tar.gz | |
Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide
| -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..78d2970f340 100644 --- a/app/assets/javascripts/repo/components/repo.vue +++ b/app/assets/javascripts/repo/components/repo.vue @@ -48,8 +48,8 @@ export default { <div class="tree-content-holder"> <repo-sidebar/><div class="panel-right" :class="{'edit-mode': editMode}"> <repo-tabs/> + <component :is="currentBlobView" class="blob-viewer-container"></component> <repo-file-buttons/> - <component :is="currentBlobView"></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 f959ab418c4..5a9877f03cd 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; |