diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-28 12:09:23 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-28 12:09:23 +0300 |
| commit | dba63244c19187d32f1f998403555f1893f5abdb (patch) | |
| tree | d07f5aa931f280617456f80c5c139789598290cf /app/assets/javascripts/groups | |
| parent | 66d107f9394f719c63cb30f53d62b5b5db888e4b (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
| -rw-r--r-- | app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue | 2 | ||||
| -rw-r--r-- | app/assets/javascripts/groups/components/group_item.vue | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue b/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue index 955cb1ca63e..763abaebebb 100644 --- a/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue +++ b/app/assets/javascripts/groups/components/empty_states/subgroups_and_projects_empty_state.vue @@ -52,7 +52,7 @@ export default { <template> <div v-if="canCreateSubgroups || canCreateProjects" class="gl-mt-5"> - <div class="gl-display-flex gl-mx-n3 gl-my-n3 gl-flex-wrap"> + <div class="gl-display-flex gl-mx-n3 gl-my-n3 gl-flex-wrap-wrap"> <div v-if="canCreateSubgroups" class="gl-p-3 gl-w-full gl-sm-w-half"> <gl-link :href="newSubgroupPath" :class="$options.linkClasses"> <div class="svg-content gl-w-15 gl-flex-shrink-0 gl-mr-5"> diff --git a/app/assets/javascripts/groups/components/group_item.vue b/app/assets/javascripts/groups/components/group_item.vue index d9781ef9c84..399a2039582 100644 --- a/app/assets/javascripts/groups/components/group_item.vue +++ b/app/assets/javascripts/groups/components/group_item.vue @@ -190,7 +190,7 @@ export default { <div class="group-text-container d-flex flex-fill align-items-center"> <div class="group-text flex-grow-1 flex-shrink-1"> <div - class="gl-display-flex gl-align-items-center gl-flex-wrap title namespace-title gl-font-weight-bold gl-mr-3" + class="gl-display-flex gl-align-items-center gl-flex-wrap-wrap title namespace-title gl-font-weight-bold gl-mr-3" > <a v-gl-tooltip.bottom @@ -259,7 +259,7 @@ export default { <gl-badge variant="warning">{{ __('pending deletion') }}</gl-badge> </div> <div - class="metadata gl-display-flex gl-flex-grow-1 gl-flex-shrink-0 gl-flex-wrap justify-content-md-between" + class="metadata gl-display-flex gl-flex-grow-1 gl-flex-shrink-0 gl-flex-wrap-wrap justify-content-md-between" > <item-stats :item="group" |