diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 19:46:48 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2017-11-07 19:46:48 +0100 |
| commit | 6a8a3f250dbae03f9fd7cab77a361887ed926719 (patch) | |
| tree | 67d82793be04c8bc0d262719af3f5adc4b36ffde /app/assets | |
| parent | fa3af6de66a9737d47dd475a36d3e4965fc69692 (diff) | |
| parent | d9a1dc3ddd3f491fb3ed922c0b85819e9fa95fea (diff) | |
| download | gitlab-ce-6a8a3f250dbae03f9fd7cab77a361887ed926719.tar.gz | |
Merge remote-tracking branch 'origin/master' into add-ingress-to-cluster-applications
Diffstat (limited to 'app/assets')
5 files changed, 10 insertions, 19 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/framework/animations.scss b/app/assets/stylesheets/framework/animations.scss index 1b944831082..374988bb590 100644 --- a/app/assets/stylesheets/framework/animations.scss +++ b/app/assets/stylesheets/framework/animations.scss @@ -23,16 +23,6 @@ @include webkit-prefix(animation-duration, 2s); } - &.spin-cw { - transform-origin: center; - animation: spin 4s linear infinite; - } - - &.spin-ccw { - transform-origin: center; - animation: spin 4s linear infinite reverse; - } - &.flipOutX, &.flipOutY, &.bounceIn, @@ -281,9 +271,3 @@ a { transform: translateX(468px); } } - -@keyframes spin { - 100% { - transform: rotate(360deg); - } -} 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; +} |