diff options
Diffstat (limited to 'app/views/layouts/nav')
| -rw-r--r-- | app/views/layouts/nav/_breadcrumbs.html.haml | 2 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_group.html.haml | 10 | ||||
| -rw-r--r-- | app/views/layouts/nav/sidebar/_project.html.haml | 4 |
3 files changed, 12 insertions, 4 deletions
diff --git a/app/views/layouts/nav/_breadcrumbs.html.haml b/app/views/layouts/nav/_breadcrumbs.html.haml index 43f1011a85b..dd2c5e2a19e 100644 --- a/app/views/layouts/nav/_breadcrumbs.html.haml +++ b/app/views/layouts/nav/_breadcrumbs.html.haml @@ -8,7 +8,7 @@ - if defined?(@left_sidebar) = button_tag class: 'toggle-mobile-nav', type: 'button' do %span.sr-only= _("Open sidebar") - = sprite_icon('hamburger') + = sprite_icon('hamburger', size: 18) .breadcrumbs-links.js-title-container{ data: { qa_selector: 'breadcrumb_links_content' } } %ul.list-unstyled.breadcrumbs-list.js-breadcrumbs-list - unless hide_top_links diff --git a/app/views/layouts/nav/sidebar/_group.html.haml b/app/views/layouts/nav/sidebar/_group.html.haml index efe8e57cadf..473a0d131b8 100644 --- a/app/views/layouts/nav/sidebar/_group.html.haml +++ b/app/views/layouts/nav/sidebar/_group.html.haml @@ -10,6 +10,8 @@ .sidebar-context-title = @group.name %ul.sidebar-top-level-items.qa-group-sidebar + = render_if_exists 'layouts/nav/sidebar/group_trial_status_widget', group: @group + - if group_sidebar_link?(:overview) - paths = group_overview_nav_link_paths = nav_link(path: paths, unless: -> { current_path?('groups/contribution_analytics#show') }, html_options: { class: 'home' }) do @@ -148,7 +150,7 @@ = sprite_icon('settings') %span.nav-item-name.qa-group-settings-item = _('Settings') - %ul.sidebar-sub-level-items.qa-group-sidebar-submenu + %ul.sidebar-sub-level-items.qa-group-sidebar-submenu{ data: { testid: 'group-settings-menu' } } = nav_link(path: %w[groups#projects groups#edit badges#index ci_cd#show], html_options: { class: "fly-out-top-item" } ) do = link_to edit_group_path(@group) do %strong.fly-out-top-item-name @@ -179,6 +181,12 @@ %span = _('CI / CD') + - if Feature.enabled?(:packages_and_registries_group_settings, @group) + = nav_link(controller: :packages_and_registries) do + = link_to group_settings_packages_and_registries_path(@group), title: _('Packages & Registries') do + %span + = _('Packages & Registries') + = render_if_exists "groups/ee/settings_nav" = render_if_exists "groups/ee/administration_nav" diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml index 5cadabd5f90..e02b8333c60 100644 --- a/app/views/layouts/nav/sidebar/_project.html.haml +++ b/app/views/layouts/nav/sidebar/_project.html.haml @@ -300,8 +300,8 @@ = link_to _('Auto DevOps'), help_page_path('topics/autodevops/index.md') %span= _('uses Kubernetes clusters to deploy your code!') %hr - %button.btn.btn-success.btn-sm.dismiss-feature-highlight{ type: 'button' } - %span= _("Got it!") + %button.gl-button.btn.btn-success.btn-sm.dismiss-feature-highlight{ type: 'button' } + %span.gl-mr-2= _("Got it!") = sprite_icon('thumb-up') - if project_nav_tab? :environments |