From 9a7a46ac6dcfbe24e6c3a16302b2bc16ff70bab6 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Fri, 4 Aug 2017 14:27:44 +0200
Subject: Add fixed height to blob-viewer-container

---
 app/assets/javascripts/repo/components/repo.vue | 2 +-
 app/assets/stylesheets/pages/repo.scss          | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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;
-- 
cgit v1.2.1


From d64196fbf91ca898af3918ddbfc831d76e828900 Mon Sep 17 00:00:00 2001
From: Clement Ho <ClemMakesApps@gmail.com>
Date: Fri, 4 Aug 2017 14:30:33 +0200
Subject: Move repo file buttons to below the blob viewer

---
 app/assets/javascripts/repo/components/repo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue
index ae659c399f9..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/>
-    <repo-file-buttons/>
     <component :is="currentBlobView" class="blob-viewer-container"></component>
+    <repo-file-buttons/>
     <!-- <repo-binary-viewer/> soon™ -->
   </div>
   <repo-commit-section/>
-- 
cgit v1.2.1