summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/assets/javascripts/repo/components/repo.vue2
-rw-r--r--app/assets/stylesheets/pages/repo.scss5
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;