summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIllya Klymov <xanf@xanf.me>2019-08-16 05:52:15 +0300
committerPaul Slaughter <pslaughter@gitlab.com>2019-08-19 16:02:54 -0500
commit99897d41fc0ba99d5be46ab2787df3279b1ce81b (patch)
tree94b417bb3c89e9ad8228d96928d5225120a24b16
parentf4ce990b0e2811cd2c3391fc5f11de990bc54f16 (diff)
downloadgitlab-ce-fix-file-row-styling.tar.gz
Update file row stylingfix-file-row-styling
-rw-r--r--app/assets/javascripts/vue_shared/components/file_row.vue8
-rw-r--r--changelogs/unreleased/fix-file-row-styling.yml5
2 files changed, 7 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>
diff --git a/changelogs/unreleased/fix-file-row-styling.yml b/changelogs/unreleased/fix-file-row-styling.yml
new file mode 100644
index 00000000000..a4427fdd48f
--- /dev/null
+++ b/changelogs/unreleased/fix-file-row-styling.yml
@@ -0,0 +1,5 @@
+---
+title: Fix loading icon causing text to jump in file row of Web IDE
+merge_request: 31884
+author:
+type: fixed