Fixing up after the merge

19 files changed, 43 insertions, 38 deletions

diff --git a/app/assets/javascripts/repo/components/commit_sidebar/list.vue b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
index fb862e7bf01..fb862e7bf01 100644
--- a/app/assets/javascripts/repo/components/commit_sidebar/list.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list.vue
diff --git a/app/assets/javascripts/repo/components/commit_sidebar/list_collapsed.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue
index 6a0262f271b..6a0262f271b 100644
--- a/app/assets/javascripts/repo/components/commit_sidebar/list_collapsed.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_collapsed.vue
diff --git a/app/assets/javascripts/repo/components/commit_sidebar/list_item.vue b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
index 742f746e02f..742f746e02f 100644
--- a/app/assets/javascripts/repo/components/commit_sidebar/list_item.vue
+++ b/app/assets/javascripts/ide/components/commit_sidebar/list_item.vue
diff --git a/app/assets/javascripts/ide/components/ide.vue b/app/assets/javascripts/ide/components/ide.vue
index 08079d7c687..03ed6935b54 100644
--- a/app/assets/javascripts/ide/components/ide.vue
+++ b/app/assets/javascripts/ide/components/ide.vue
@@ -4,7 +4,6 @@
 import { mapState, mapGetters } from 'vuex';
 import IdeSidebar from './ide_side_bar.vue';
 import IdeContextbar from './ide_context_bar.vue';
-
 import RepoTabs from './repo_tabs.vue';
 import RepoFileButtons from './repo_file_buttons.vue';
 import IdeStatusBar from './ide_status_bar.vue';
@@ -46,25 +45,32 @@ export default {
 </script>
 
 <template>
-  <div class="ide-view page-gutter page-with-contextual-sidebar page-with-sidebar right-sidebar-collapsed">
+  <div 
+    class="multi-file ide-view page-gutter page-with-contextual-sidebar page-with-sidebar right-sidebar-collapsed"
+  >
     <ide-sidebar/>
     <div class="panel-right content-wrapper page-with-new-nav">
       <div class="content" id="content-body">
         <ide-contextbar/>
-        <template
-          v-if="activeFile">
-          <repo-tabs/>
-          <component
-            :is="currentBlobView"
-          />
-          <repo-file-buttons/>
-          <ide-status-bar/>
-        </template>
-        <template
-          v-else>
-          <br/><br/><br/><br/><br/>
-          <h4 class="muted text-center">Welcome to the GitLab IDE</h4>
-        </template>
+        <div
+          class="multi-file-edit-pane"
+        >
+          <template
+            v-if="activeFile">
+            <repo-tabs/>
+            <component
+              class="multi-file-edit-pane-content"
+              :is="currentBlobView"
+            />
+            <repo-file-buttons/>
+            <ide-status-bar/>
+          </template>
+          <template
+            v-else>
+            <br/><br/><br/><br/><br/>
+            <h4 class="muted text-center">Welcome to the GitLab IDE</h4>
+          </template>
+        </div>
       </div>
     </div>
   </div>
diff --git a/app/assets/javascripts/ide/components/ide_context_bar.vue b/app/assets/javascripts/ide/components/ide_context_bar.vue
index a2ed05148cf..eea01a77f63 100644
--- a/app/assets/javascripts/ide/components/ide_context_bar.vue
+++ b/app/assets/javascripts/ide/components/ide_context_bar.vue
@@ -26,7 +26,7 @@ export default {
         </a>
       </div>
       
-      <repo-commit-section v-if="changedFiles.length" />
+      <repo-commit-section />
     </div>
   </aside>
 </template>
diff --git a/app/assets/javascripts/ide/components/ide_repo_tree.vue b/app/assets/javascripts/ide/components/ide_repo_tree.vue
index 73dd6b640f9..7e1f0fdbd47 100644
--- a/app/assets/javascripts/ide/components/ide_repo_tree.vue
+++ b/app/assets/javascripts/ide/components/ide_repo_tree.vue
@@ -35,26 +35,13 @@ export default {
 </script>
 
 <template>
-<div id="sidebar">
+<div>
   <div class="ide-file-list">
     <table class="table">
       <thead>
         <tr>
-          <th
-            v-if="isCollapsed"
-          >
+          <th>
           </th>
-          <template v-else>
-            <th class="name multi-file-table-name">
-              Name
-            </th>
-            <th class="hidden-sm hidden-xs last-commit">
-              Last commit
-            </th>
-            <th class="hidden-xs last-update text-right">
-              Last update
-            </th>
-          </template>
         </tr>
       </thead>
       <tbody
diff --git a/app/assets/javascripts/ide/components/repo_commit_section.vue b/app/assets/javascripts/ide/components/repo_commit_section.vue
index d3344d0c8dc..320a0a9a7e4 100644
--- a/app/assets/javascripts/ide/components/repo_commit_section.vue
+++ b/app/assets/javascripts/ide/components/repo_commit_section.vue
@@ -129,7 +129,7 @@ export default {
   <form
     class="form-horizontal multi-file-commit-form"
     @submit.prevent="tryCommit"
-    v-if="!collapsed"
+    v-if="!collapsed && changedFiles.length"
   >
     <div class="multi-file-commit-fieldset">
       <textarea
diff --git a/app/assets/javascripts/ide/components/repo_editor.vue b/app/assets/javascripts/ide/components/repo_editor.vue
index 6a81ba03aa1..94af9d504b6 100644
--- a/app/assets/javascripts/ide/components/repo_editor.vue
+++ b/app/assets/javascripts/ide/components/repo_editor.vue
@@ -102,6 +102,7 @@ export default {
     <div
       v-show="!shouldHideEditor"
       ref="editor"
+      class="multi-file-editor-holder"
     >
     </div>
   </div>
diff --git a/app/assets/javascripts/ide/components/repo_file.vue b/app/assets/javascripts/ide/components/repo_file.vue
index 6515852fbee..8ff60599952 100644
--- a/app/assets/javascripts/ide/components/repo_file.vue
+++ b/app/assets/javascripts/ide/components/repo_file.vue
@@ -87,7 +87,7 @@
       </template>
     </td>
 
-    <template v-if="!isCollapsed && !isSubmodule">
+    <template v-if="false == true">
       <td class="multi-file-table-col-commit-message hidden-sm hidden-xs">
         <a
           v-if="file.lastCommit.message"
diff --git a/app/assets/javascripts/repo/lib/common/disposable.js b/app/assets/javascripts/ide/lib/common/disposable.js
index 84b29bdb600..84b29bdb600 100644
--- a/app/assets/javascripts/repo/lib/common/disposable.js
+++ b/app/assets/javascripts/ide/lib/common/disposable.js
diff --git a/app/assets/javascripts/repo/lib/common/model.js b/app/assets/javascripts/ide/lib/common/model.js
index 23c4811e6c0..23c4811e6c0 100644
--- a/app/assets/javascripts/repo/lib/common/model.js
+++ b/app/assets/javascripts/ide/lib/common/model.js
diff --git a/app/assets/javascripts/repo/lib/common/model_manager.js b/app/assets/javascripts/ide/lib/common/model_manager.js
index fd462252795..fd462252795 100644
--- a/app/assets/javascripts/repo/lib/common/model_manager.js
+++ b/app/assets/javascripts/ide/lib/common/model_manager.js
diff --git a/app/assets/javascripts/repo/lib/decorations/controller.js b/app/assets/javascripts/ide/lib/decorations/controller.js
index 0954b7973c4..0954b7973c4 100644
--- a/app/assets/javascripts/repo/lib/decorations/controller.js
+++ b/app/assets/javascripts/ide/lib/decorations/controller.js
diff --git a/app/assets/javascripts/repo/lib/diff/controller.js b/app/assets/javascripts/ide/lib/diff/controller.js
index dc0b1c95e59..dc0b1c95e59 100644
--- a/app/assets/javascripts/repo/lib/diff/controller.js
+++ b/app/assets/javascripts/ide/lib/diff/controller.js
diff --git a/app/assets/javascripts/repo/lib/diff/diff.js b/app/assets/javascripts/ide/lib/diff/diff.js
index 0e37f5c4704..0e37f5c4704 100644
--- a/app/assets/javascripts/repo/lib/diff/diff.js
+++ b/app/assets/javascripts/ide/lib/diff/diff.js
diff --git a/app/assets/javascripts/repo/lib/diff/diff_worker.js b/app/assets/javascripts/ide/lib/diff/diff_worker.js
index e74c4046330..e74c4046330 100644
--- a/app/assets/javascripts/repo/lib/diff/diff_worker.js
+++ b/app/assets/javascripts/ide/lib/diff/diff_worker.js
diff --git a/app/assets/javascripts/repo/lib/editor.js b/app/assets/javascripts/ide/lib/editor.js
index db499444402..b61964ddf50 100644
--- a/app/assets/javascripts/repo/lib/editor.js
+++ b/app/assets/javascripts/ide/lib/editor.js
@@ -32,6 +32,9 @@ export default class Editor {
           readOnly: false,
           contextmenu: true,
           scrollBeyondLastLine: false,
+          minimap: {
+            enabled: false,
+          },
         }),
         this.dirtyDiffController = new DirtyDiffController(
           this.modelManager, this.decorationsController,
diff --git a/app/assets/javascripts/repo/lib/editor_options.js b/app/assets/javascripts/ide/lib/editor_options.js
index 701affc466e..701affc466e 100644
--- a/app/assets/javascripts/repo/lib/editor_options.js
+++ b/app/assets/javascripts/ide/lib/editor_options.js
diff --git a/app/assets/stylesheets/pages/ide.scss b/app/assets/stylesheets/pages/ide.scss
index d0437961f2d..47b6583255a 100644
--- a/app/assets/stylesheets/pages/ide.scss
+++ b/app/assets/stylesheets/pages/ide.scss
@@ -1,4 +1,4 @@
-.modal.popup-dialog {
+/*.modal.popup-dialog {
   display: block;
   background-color: $black-transparent;
   z-index: 2100;
@@ -40,13 +40,14 @@
   height: calc(100vh - #{$header-height});
   margin-top: $header-height;
   color: $almost-black;
+  border-top: 1px solid $white-dark;
+  border-bottom: 1px solid $white-dark;
 
   .code.white pre .hll {
     background-color: $well-light-border !important;
   }
 
   .ide-content-holder {
-    display: -webkit-flex;
     display: flex;
     flex: 1;
     height: 100vh;
@@ -56,10 +57,16 @@
     height: 100vh;
   }
 
+  .multi-file-table-name,
+  .multi-file-table-col-commit-message {
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    max-width: 0;
+  }
+
   .panel-right {
-    display: -webkit-flex;
     display: flex;
-    -webkit-flex-direction: column;
     flex-direction: column;
     margin-top: 0;
     padding-bottom: 0;
@@ -333,6 +340,7 @@
 .multi-file-table-col-name {
   width: 350px;
 }
+*/
 
 .ide-loading {
   padding-top: 200px;