summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-11-06 18:35:50 +0100
committerTim Zallmann <tzallmann@gitlab.com>2017-11-06 18:35:50 +0100
commitf4627407967b233af0b89567a02094bcf138334f (patch)
treecd310b21e2b6772f8496030f49db984afd1339ea
parent8a26706141bd43afa1fca093228f0d8267c39566 (diff)
downloadgitlab-ce-tz-ide-styling.tar.gz
Full Width Stylingtz-ide-styling
-rw-r--r--app/assets/javascripts/repo/components/repo.vue5
-rw-r--r--app/assets/javascripts/repo/components/repo_editor.vue3
-rw-r--r--app/assets/stylesheets/pages/repo.scss4
3 files changed, 11 insertions, 1 deletions
diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue
index 98117802016..4ee7b0a90ef 100644
--- a/app/assets/javascripts/repo/components/repo.vue
+++ b/app/assets/javascripts/repo/components/repo.vue
@@ -35,6 +35,11 @@ export default {
});
return returnValue;
};
+
+ // Make the repo editor fluid
+ document.querySelector('#content-body .container-limited').classList.remove('container-limited');
+ document.querySelector('.breadcrumbs.container-limited').classList.remove('container-limited');
+ document.querySelector('.content-wrapper').style.paddingBottom = '0';
},
};
</script>
diff --git a/app/assets/javascripts/repo/components/repo_editor.vue b/app/assets/javascripts/repo/components/repo_editor.vue
index 1c864b176b1..03466cecb33 100644
--- a/app/assets/javascripts/repo/components/repo_editor.vue
+++ b/app/assets/javascripts/repo/components/repo_editor.vue
@@ -41,6 +41,9 @@ export default {
readOnly: false,
contextmenu: true,
scrollBeyondLastLine: false,
+ fixedOverflowWidgets: true,
+ folding: true,
+ renderIndentGuides: true,
});
this.languages = this.monaco.languages.getLanguages();
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index 1bb4e3cc345..5d629635fa9 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -48,10 +48,11 @@
display: -webkit-flex;
display: flex;
min-height: 300px;
+ height: calc(100vh - 160px)
}
.tree-content-holder-mini {
- height: 100vh;
+ height: calc(100vh - 160px)
}
.panel-right {
@@ -245,6 +246,7 @@
#sidebar {
flex: 1;
height: 100%;
+ overflow: auto;
&.sidebar-mini {
width: 20%;