diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-08-18 00:09:56 +0300 |
| commit | 9facfe5cb194005894467c06e4ea1a9800034ab4 (patch) | |
| tree | 5ceaecd5f89725250bbf4119558715fa14576c4c /app/assets/javascripts/groups | |
| parent | 18da92341dac366b7bcfd13f2d3c443ffa315af0 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/groups')
| -rw-r--r-- | app/assets/javascripts/groups/components/item_actions.vue | 4 | ||||
| -rw-r--r-- | app/assets/javascripts/groups/components/item_stats.vue | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/assets/javascripts/groups/components/item_actions.vue b/app/assets/javascripts/groups/components/item_actions.vue index 985ea5a9019..ac4c12dda24 100644 --- a/app/assets/javascripts/groups/components/item_actions.vue +++ b/app/assets/javascripts/groups/components/item_actions.vue @@ -53,7 +53,7 @@ export default { :aria-label="leaveBtnTitle" data-container="body" data-placement="bottom" - class="leave-group btn btn-xs no-expand gl-text-gray-700 gl-ml-5" + class="leave-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5" @click.prevent="onLeaveGroup" > <icon name="leave" class="position-top-0" /> @@ -66,7 +66,7 @@ export default { :aria-label="editBtnTitle" data-container="body" data-placement="bottom" - class="edit-group btn btn-xs no-expand gl-text-gray-700 gl-ml-5" + class="edit-group btn btn-xs no-expand gl-text-gray-500 gl-ml-5" > <icon name="settings" class="position-top-0 align-middle" /> </a> diff --git a/app/assets/javascripts/groups/components/item_stats.vue b/app/assets/javascripts/groups/components/item_stats.vue index ffe4b18dea1..e09df8a5d26 100644 --- a/app/assets/javascripts/groups/components/item_stats.vue +++ b/app/assets/javascripts/groups/components/item_stats.vue @@ -1,5 +1,6 @@ <script> import { GlBadge } from '@gitlab/ui'; +import isProjectPendingRemoval from 'ee_else_ce/groups/mixins/is_project_pending_removal'; import timeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; import { ITEM_TYPE, @@ -8,7 +9,6 @@ import { PROJECT_VISIBILITY_TYPE, } from '../constants'; import itemStatsValue from './item_stats_value.vue'; -import isProjectPendingRemoval from 'ee_else_ce/groups/mixins/is_project_pending_removal'; export default { components: { @@ -44,7 +44,7 @@ export default { </script> <template> - <div class="stats gl-text-gray-700"> + <div class="stats gl-text-gray-500"> <item-stats-value v-if="isGroup" :title="__('Subgroups')" |