diff --git a/app/views/projects/usage_quotas/index.html.haml b/app/views/projects/usage_quotas/index.html.haml index de1135cf928fcf17b860062c19b7a4e6ca7a4827..5b4edc92d1d207c0dc27527f4f96863d89308cf3 100644 --- a/app/views/projects/usage_quotas/index.html.haml +++ b/app/views/projects/usage_quotas/index.html.haml @@ -9,11 +9,10 @@ %a{ href: help_page_path('user/usage_quotas.md'), target: '_blank', rel: 'noopener noreferrer' } = s_('UsageQuota|Learn more about usage quotas') + '.' -.top-area.scrolling-tabs-container.inner-page-scroll-tabs - %ul.nav.nav-tabs.nav-links.scrolling-tabs.separator.js-usage-quota-tabs{ role: 'tablist' } - %li.nav-item - %a.nav-link#storage-quota{ data: { toggle: "tab", action: '#storage-quota-tab' }, href: '#storage-quota-tab', 'aria-controls': '#storage-quota-tab', 'aria-selected': 'true' } - = s_('UsageQuota|Storage') += gl_tabs_nav do + = gl_tab_link_to '#storage-quota-tab', item_active: true do + = s_('UsageQuota|Storage') + .tab-content - .tab-pane#storage-quota-tab + .tab-pane.active#storage-quota-tab #js-project-storage-count-app{ data: { project_path: @project.full_path } } diff --git a/ee/app/assets/javascripts/pages/projects/usage_quotas/index.js b/ee/app/assets/javascripts/pages/projects/usage_quotas/index.js index 40aa0b7627bffdcc6852eb6e28945733c1da8689..7df07936999220ba4c38f8043cfe886b4580de60 100644 --- a/ee/app/assets/javascripts/pages/projects/usage_quotas/index.js +++ b/ee/app/assets/javascripts/pages/projects/usage_quotas/index.js @@ -1,23 +1,9 @@ -import LinkedTabs from '~/lib/utils/bootstrap_linked_tabs'; import initProjectStorage from 'ee/usage_quotas/storage/init_project_storage'; import initSearchSettings from '~/search_settings'; -const initLinkedTabs = () => { - if (!document.querySelector('.js-usage-quota-tabs')) { - return false; - } - - return new LinkedTabs({ - defaultAction: '#storage-quota-tab', - parentEl: '.js-usage-quota-tabs', - hashedTabs: true, - }); -}; - const initVueApp = () => { initProjectStorage('js-project-storage-count-app'); }; initVueApp(); -initLinkedTabs(); initSearchSettings();