Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Schatz <jschatz1@gmail.com>2017-08-02 22:46:51 +0300
committerJacob Schatz <jschatz1@gmail.com>2017-08-02 22:46:51 +0300
commitd0ffbd18fa5be4e90d150bc617d0cc7eb3c8720b (patch)
treebd910f6c8c57f04056433caa3152b0e8cb3a912e /app/assets/javascripts/repo/components/repo_editor.vue
parent92e1707c8ff5a6ee99c21d612a71a1133749d2d6 (diff)
Revert "fixed monaco height"
This reverts commit ba8bcdabf010deae7def166fbe364948bc9bf5a4.
Diffstat (limited to 'app/assets/javascripts/repo/components/repo_editor.vue')
-rw-r--r--app/assets/javascripts/repo/components/repo_editor.vue3
1 files changed, 1 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';
}
},