summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2018-12-06 08:50:02 +0000
committerFilipa Lacerda <filipa@gitlab.com>2018-12-06 08:50:02 +0000
commit935faf7741b3411783975b8a330fc82d4ab2e635 (patch)
treed09a5cd78cfcfa6b4382d76e2236d33d2810d57b
parent1f35e5bd64ab2f5bc7d6e4a8f2c4cfeb6c813190 (diff)
parenta0314bb974a13e0fc9f982c2f44af8f379ea453e (diff)
downloadgitlab-ce-935faf7741b3411783975b8a330fc82d4ab2e635.tar.gz
Merge branch 'gt-add-top-padding-for-nested-environment-items-loading-icon' into 'master'
Add top padding for nested environment items loading icon Closes #49450 See merge request gitlab-org/gitlab-ce!23580
-rw-r--r--app/assets/javascripts/environments/components/environments_table.vue2
-rw-r--r--changelogs/unreleased/gt-add-top-padding-for-nested-environment-items-loading-icon.yml5
2 files changed, 6 insertions, 1 deletions
diff --git a/app/assets/javascripts/environments/components/environments_table.vue b/app/assets/javascripts/environments/components/environments_table.vue
index 5164d87c5fa..533e90e2222 100644
--- a/app/assets/javascripts/environments/components/environments_table.vue
+++ b/app/assets/javascripts/environments/components/environments_table.vue
@@ -70,7 +70,7 @@ export default {
<template v-if="shouldRenderFolderContent(model)">
<div v-if="model.isLoadingFolderContent" :key="`loading-item-${i}`">
- <gl-loading-icon :size="2" />
+ <gl-loading-icon :size="2" class="prepend-top-16" />
</div>
<template v-else>
diff --git a/changelogs/unreleased/gt-add-top-padding-for-nested-environment-items-loading-icon.yml b/changelogs/unreleased/gt-add-top-padding-for-nested-environment-items-loading-icon.yml
new file mode 100644
index 00000000000..606314b5780
--- /dev/null
+++ b/changelogs/unreleased/gt-add-top-padding-for-nested-environment-items-loading-icon.yml
@@ -0,0 +1,5 @@
+---
+title: Add top padding for nested environment items loading icon
+merge_request: 23580
+author: George Tsiolis
+type: fixed