diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-19 15:57:54 +0300 |
commit | 419c53ec62de6e97a517abd5fdd4cbde3a942a34 (patch) | |
tree | 1f43a548b46bca8a5fb8fe0c31cef1883d49c5b6 /app/assets/javascripts/super_sidebar/components/sidebar_menu.vue | |
parent | 1da20d9135b3ad9e75e65b028bffc921aaf8deb7 (diff) |
Add latest changes from gitlab-org/gitlab@16-5-stable-eev16.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/super_sidebar/components/sidebar_menu.vue')
-rw-r--r-- | app/assets/javascripts/super_sidebar/components/sidebar_menu.vue | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue index 02488e99c0e..772072c0996 100644 --- a/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue +++ b/app/assets/javascripts/super_sidebar/components/sidebar_menu.vue @@ -158,7 +158,11 @@ export default { <template> <div class="gl-p-2 gl-relative"> - <ul v-if="hasStaticItems" class="gl-p-0 gl-m-0" data-testid="static-items-section"> + <ul + v-if="hasStaticItems" + class="gl-list-style-none gl-p-0 gl-m-0" + data-testid="static-items-section" + > <nav-item v-for="item in staticItems" :key="item.id" :item="item" is-static /> </ul> <pinned-section @@ -174,7 +178,11 @@ export default { class="gl-my-2 gl-mx-4" data-testid="main-menu-separator" /> - <ul class="gl-p-0 gl-list-style-none" data-testid="non-static-items-section"> + <ul + aria-labelledby="super-sidebar-context-header" + class="gl-p-0 gl-list-style-none" + data-testid="non-static-items-section" + > <template v-for="item in nonStaticItems"> <menu-section v-if="isSection(item)" @@ -182,6 +190,7 @@ export default { :item="item" :separated="item.separated" :has-flyout="showFlyoutMenus" + tag="li" @pin-add="createPin" @pin-remove="destroyPin" /> @@ -189,7 +198,6 @@ export default { v-else :key="item.id" :item="item" - tag="li" @pin-add="createPin" @pin-remove="destroyPin" /> |