diff options
author | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 22:27:14 +0000 |
---|---|---|
committer | Paul Slaughter <pslaughter@gitlab.com> | 2019-08-19 22:27:14 +0000 |
commit | d4a5e3fd8746a3af2d57060d304b760e7539d752 (patch) | |
tree | ad60c2f88ecc7f86298b6509a498cd1e36188dc8 /app/assets/javascripts | |
parent | f3d65e78bc3b3d65d3ee445bc40bae49ec29a966 (diff) | |
parent | 99897d41fc0ba99d5be46ab2787df3279b1ce81b (diff) | |
download | gitlab-ce-d4a5e3fd8746a3af2d57060d304b760e7539d752.tar.gz |
Merge branch 'fix-file-row-styling' into 'master'
Update file row styling
See merge request gitlab-org/gitlab-ce!31884
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r-- | app/assets/javascripts/vue_shared/components/file_row.vue | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/app/assets/javascripts/vue_shared/components/file_row.vue b/app/assets/javascripts/vue_shared/components/file_row.vue index fe5289ff371..f49e69c473b 100644 --- a/app/assets/javascripts/vue_shared/components/file_row.vue +++ b/app/assets/javascripts/vue_shared/components/file_row.vue @@ -146,6 +146,7 @@ export default { <span ref="textOutput" :style="levelIndentation" class="file-row-name str-truncated"> <file-icon v-if="!showChangedIcon || file.type === 'tree'" + class="file-row-icon" :file-name="file.name" :loading="file.loading" :folder="isTree" @@ -223,13 +224,8 @@ export default { white-space: nowrap; } -.file-row-name svg { +.file-row-name .file-row-icon { margin-right: 2px; vertical-align: middle; } - -.file-row-name .loading-container { - display: inline-block; - margin-right: 4px; -} </style> |