diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 21:07:59 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-09 21:07:59 +0300 |
| commit | 7ebcead8cfd2edb810dd0cbda816b6cfbd170fe3 (patch) | |
| tree | 11880c4059c89149cf997e9b958fb6d32c7dbdad /app/assets/javascripts/groups | |
| parent | f1a40d0db939dfe8ff95d385e652ff72566be765 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
| -rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/groups/components/item_actions.vue | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index b192fb78631..1b8c75202fb 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -95,7 +95,7 @@ export default { <li :id="groupDomId" :class="rowClass" class="group-row" @click.stop="onClickRowGroup"> <div :class="{ 'project-row-contents': !isGroup }" - class="group-row-contents d-flex align-items-center py-2" + class="group-row-contents d-flex align-items-center py-2 pr-3" > <div class="folder-toggle-wrap append-right-4 d-flex align-items-center"> <item-caret :is-group-open="group.isOpen" /> @@ -103,8 +103,8 @@ export default { </div> <gl-loading-icon v-if="group.isChildrenLoading" - size="md" - class="d-none d-sm-inline-flex flex-shrink-0 append-right-10" + size="lg" + class="d-none d-sm-inline-flex flex-shrink-0 append-right-8" /> <div :class="{ 'd-sm-flex': !group.isChildrenLoading }" diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index 4b569970204..5454480e61a 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -68,7 +68,7 @@ export default { data-placement="bottom" class="edit-group btn btn-xs no-expand" > - <icon name="settings" class="position-top-0" /> + <icon name="settings" class="position-top-0 align-middle" /> </a> </div> </template> |