From d0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b Mon Sep 17 00:00:00 2001
From: Jacob Schatz <jschatz1@gmail.com>
Date: Wed, 2 Aug 2017 15:46:51 -0400
Subject: [PATCH] Revert "fixed monaco height"

This reverts commit ba8bcdabf010deae7def166fbe364948bc9bf5a4.
---
 app/assets/javascripts/repo/components/repo_editor.vue | 3 +--
 app/assets/stylesheets/pages/repo.scss                 | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue
index 34dde9e588f..97b6172353e 100644
--- a/app/assets/javascripts/repo/components/repo_editor.vue
+++ b/app/assets/javascripts/repo/components/repo_editor.vue
@@ -24,7 +24,6 @@ const RepoEditor = {
       const newModel = this.monaco.editor.createModel(this.blobRaw, languageID);
 
       this.monacoInstance.setModel(newModel);
-      this.monacoInstance.layout();
     }).catch(Helper.loadingError);
   },
 
@@ -33,7 +32,7 @@ const RepoEditor = {
       if (!this.openedFiles.length || (this.binary && !this.activeFile.raw)) {
         this.$el.style.display = 'none';
       } else {
-        this.$el.style.display = '';
+        this.$el.style.display = 'inline-block';
       }
     },
 
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 0c14ebf812f..19d010c430b 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -152,6 +152,7 @@
       padding: 10px 5px;
       position: relative;
       border-top: 1px solid $white-normal;
+      margin-top: -5px;
     }
 
     #binary-viewer {