diff options
| author | Phil Hughes <me@iamphill.com> | 2017-11-30 16:34:24 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2017-11-30 16:34:24 +0000 |
| commit | 3c0b143e183b133312f8ea45b0c35b8b84257e8a (patch) | |
| tree | 495b406968dcd3fdbbf46d9c395c564809a11792 | |
| parent | 445c2432c7c61af5674627b3f5e5fc88323dac44 (diff) | |
| download | gitlab-ce-ide-monaco-size-fix.tar.gz | |
Fixed IDE monaco instance height & alignmentide-monaco-size-fix
| -rw-r--r-- | app/assets/javascripts/repo/components/repo_editor.vue | 1 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/repo.scss | 4 | ||||
| -rw-r--r-- | app/views/projects/_files.html.haml | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue index f37cbd1e961..7bc5c030fc1 100644 --- a/app/assets/javascripts/repo/components/repo_editor.vue +++ b/app/assets/javascripts/repo/components/repo_editor.vue @@ -83,6 +83,7 @@ export default { <div v-show="!shouldHideEditor" ref="editor" + class="multi-file-editor-holder" > </div> </div> diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss index 402412eae71..92203920971 100644 --- a/app/assets/stylesheets/pages/repo.scss +++ b/app/assets/stylesheets/pages/repo.scss @@ -276,6 +276,10 @@ resize: none; } +.multi-file-editor-holder { + height: 100%; +} + .dirty-diff { // !important need to override monaco inline style width: 4px !important; diff --git a/app/views/projects/_files.html.haml b/app/views/projects/_files.html.haml index 3a7a99462a6..945766d60eb 100644 --- a/app/views/projects/_files.html.haml +++ b/app/views/projects/_files.html.haml @@ -4,8 +4,9 @@ - content_url = local_assigns.fetch(:content_url) { @tree.readme ? project_blob_path(@project, tree_join(@ref, @tree.readme.path)) : project_tree_path(@project, @ref) } #tree-holder.tree-holder.clearfix - .nav-block - = render 'projects/tree/tree_header', tree: @tree + %div{ class: ("container-fluid container-limited limit-container-width" if show_new_repo?) } + .nav-block + = render 'projects/tree/tree_header', tree: @tree - if !show_new_repo? && commit = render 'shared/commit_well', commit: commit, ref: ref, project: project |