summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-11-07 14:24:46 +0000
committerPhil Hughes <me@iamphill.com>2017-11-07 14:24:46 +0000
commit3795ce730162cd1556bd7f62fea8067019cc6d1a (patch)
treeb25c7bea384d0ef3436349c780d8cbe364a8309d
parentdc1e6b436268c00bd1fdf3d15597a4656e029b95 (diff)
downloadgitlab-ce-multi-file-editor-table-cells-width.tar.gz
Fixed multi-file editor table cells content width jumpingmulti-file-editor-table-cells-width
-rw-r--r--app/assets/javascripts/repo/components/repo_file.vue5
-rw-r--r--app/assets/javascripts/repo/components/repo_loading_file.vue2
-rw-r--r--app/assets/javascripts/repo/components/repo_sidebar.vue2
-rw-r--r--app/assets/stylesheets/pages/repo.scss4
4 files changed, 10 insertions, 3 deletions
diff --git a/app/assets/javascripts/repo/components/repo_file.vue b/app/assets/javascripts/repo/components/repo_file.vue
index 9f16e6bb2cc..5be47d568e7 100644
--- a/app/assets/javascripts/repo/components/repo_file.vue
+++ b/app/assets/javascripts/repo/components/repo_file.vue
@@ -54,7 +54,10 @@
<tr
class="file"
@click.prevent="clickedTreeRow(file)">
- <td :colspan="submoduleColSpan">
+ <td
+ class="multi-file-table-col-name"
+ :colspan="submoduleColSpan"
+ >
<i
class="fa fa-fw file-icon"
:class="fileIcon"
diff --git a/app/assets/javascripts/repo/components/repo_loading_file.vue b/app/assets/javascripts/repo/components/repo_loading_file.vue
index 14c2ddfb615..8fa637d771f 100644
--- a/app/assets/javascripts/repo/components/repo_loading_file.vue
+++ b/app/assets/javascripts/repo/components/repo_loading_file.vue
@@ -19,7 +19,7 @@
class="loading-file"
aria-label="Loading files"
>
- <td>
+ <td class="multi-file-table-col-name">
<skeleton-loading-container
:small="true"
/>
diff --git a/app/assets/javascripts/repo/components/repo_sidebar.vue b/app/assets/javascripts/repo/components/repo_sidebar.vue
index 3f61d048288..9365b09326f 100644
--- a/app/assets/javascripts/repo/components/repo_sidebar.vue
+++ b/app/assets/javascripts/repo/components/repo_sidebar.vue
@@ -57,7 +57,7 @@ export default {
</strong>
</th>
<template v-else>
- <th class="name">
+ <th class="name multi-file-table-col-name">
Name
</th>
<th class="hidden-sm hidden-xs last-commit">
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index fee4638e20f..d93c51d5448 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -298,3 +298,7 @@
width: 100%;
}
}
+
+.multi-file-table-col-name {
+ width: 350px;
+}