summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorTim Zallmann <tzallmann@gitlab.com>2017-12-05 08:45:19 +0100
committerTim Zallmann <tzallmann@gitlab.com>2017-12-19 12:26:02 +0100
commit4a3bff6c7a10d434562787aa9b41023faaca254c (patch)
treefcb90c9743510d05b2c5787b2bb11a036af156f0 /app
parent4d99d9e6b2646054ee530611ff59a1415584c5af (diff)
downloadgitlab-ce-4a3bff6c7a10d434562787aa9b41023faaca254c.tar.gz
Removed rendering of preview container to save some DOM elements
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/ide/components/repo_editor.vue2
-rw-r--r--app/assets/stylesheets/pages/repo.scss16
2 files changed, 9 insertions, 9 deletions
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index a57c3641cbd..f83c133332a 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -116,7 +116,7 @@ export default {
class="blob-viewer-container blob-editor-container"
>
<div
- v-show="shouldHideEditor"
+ v-if="shouldHideEditor"
v-html="activeFile.html"
>
</div>
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index a3a4cd55b22..393eeecd082 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -186,7 +186,7 @@
overflow: scroll;
.blob-viewer {
- height: 100%;
+ height: calc(100vh - 140px);
}
.file-content.code {
@@ -197,13 +197,6 @@
}
}
- .file-content.blob-no-preview {
- a {
- margin-left: auto;
- margin-right: auto;
- }
- }
-
.line-numbers {
min-width: 50px;
}
@@ -216,6 +209,13 @@
}
}
+.file-content.blob-no-preview {
+ a {
+ margin-left: auto;
+ margin-right: auto;
+ }
+}
+
.multi-file-commit-panel {
display: flex;
flex-direction: column;