Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2023-09-22 03:11:47 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2023-09-22 03:11:47 +0300
commit0bdb61ade7f12067dd524463af4f83994f1baa37 (patch)
tree987819d2a9e915df73874f66c52d1d9cdc889583 /app/assets/javascripts/super_sidebar
parent8746f541fbcf2b89b30c3d4a1b290f5679186400 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/super_sidebar')
-rw-r--r--app/assets/javascripts/super_sidebar/components/nav_item.vue5
1 files changed, 4 insertions, 1 deletions
diff --git a/app/assets/javascripts/super_sidebar/components/nav_item.vue b/app/assets/javascripts/super_sidebar/components/nav_item.vue
index 5e0f8fffb0e..305e2f94c20 100644
--- a/app/assets/javascripts/super_sidebar/components/nav_item.vue
+++ b/app/assets/javascripts/super_sidebar/components/nav_item.vue
@@ -145,6 +145,9 @@ export default {
hasAvatar() {
return Boolean(this.item.entity_id);
},
+ hasEndSpace() {
+ return this.hasPill || this.isPinnable || this.isFlyout;
+ },
avatarShape() {
return this.item.avatar_shape || 'rect';
},
@@ -236,7 +239,7 @@ export default {
</div>
</div>
<slot name="actions"></slot>
- <span v-if="hasPill || isPinnable" class="gl-text-right gl-relative gl-min-w-8">
+ <span v-if="hasEndSpace" class="gl-text-right gl-relative gl-min-w-6">
<gl-badge
v-if="hasPill"
size="sm"