diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-11-07 19:51:20 +0300 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-11-07 19:51:20 +0300 |
| commit | 3ae9346ab0e9cddbeb9dd7a1733cecc6457c198c (patch) | |
| tree | 5a23b34c2292d1d999a8b88503a52eb086495d0f /app | |
| parent | 396f45ade1dddec36df9861f8a1bb80aabd2ff15 (diff) | |
| parent | 3795ce730162cd1556bd7f62fea8067019cc6d1a (diff) | |
Merge branch 'multi-file-editor-table-cells-width' into 'master'
Fixed multi-file editor table cells content width jumping
See merge request gitlab-org/gitlab-ce!15245
Diffstat (limited to 'app')
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; +} |