diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-06-20 14:10:13 +0300 |
commit | 0ea3fcec397b69815975647f5e2aa5fe944a8486 (patch) | |
tree | 7979381b89d26011bcf9bdc989a40fcc2f1ed4ff /app/views/dashboard | |
parent | 72123183a20411a36d607d70b12d57c484394c8e (diff) |
Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42
Diffstat (limited to 'app/views/dashboard')
-rw-r--r-- | app/views/dashboard/_activity_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/_groups_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/_projects_head.html.haml | 11 | ||||
-rw-r--r-- | app/views/dashboard/_projects_nav.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/_snippets_head.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/issues.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/merge_requests.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/milestones/index.html.haml | 2 | ||||
-rw-r--r-- | app/views/dashboard/todos/index.html.haml | 2 |
9 files changed, 14 insertions, 13 deletions
diff --git a/app/views/dashboard/_activity_head.html.haml b/app/views/dashboard/_activity_head.html.haml index c65b947d1ba..ca9f69ab73a 100644 --- a/app/views/dashboard/_activity_head.html.haml +++ b/app/views/dashboard/_activity_head.html.haml @@ -1,5 +1,5 @@ .page-title-holder.d-flex.align-items-center - %h1.page-title= _('Activity') + %h1.page-title.gl-font-size-h-display= _('Activity') .top-area = gl_tabs_nav({ class: 'gl-border-b-0', data: { testid: 'dashboard-activity-tabs' } }) do diff --git a/app/views/dashboard/_groups_head.html.haml b/app/views/dashboard/_groups_head.html.haml index 7b1d25b9b43..f0f1413831a 100644 --- a/app/views/dashboard/_groups_head.html.haml +++ b/app/views/dashboard/_groups_head.html.haml @@ -1,5 +1,5 @@ .page-title-holder.d-flex.align-items-center - %h1.page-title= _('Groups') + %h1.page-title.gl-font-size-h-display= _('Groups') - if current_user.can_create_group? .page-title-controls diff --git a/app/views/dashboard/_projects_head.html.haml b/app/views/dashboard/_projects_head.html.haml index b94b14bf6bd..9c492a0da34 100644 --- a/app/views/dashboard/_projects_head.html.haml +++ b/app/views/dashboard/_projects_head.html.haml @@ -5,16 +5,17 @@ = render 'shared/project_limit' .page-title-holder.d-flex.align-items-center - %h1.page-title= _('Projects') + %h1.page-title.gl-font-size-h-display= _('Projects') - if current_user.can_create_project? .page-title-controls = link_to _("New project"), new_project_path, class: "gl-button btn btn-confirm", data: { qa_selector: 'new_project_button' } -.top-area.scrolling-tabs-container.inner-page-scroll-tabs - .fade-left= sprite_icon('chevron-lg-left', size: 12) - .fade-right= sprite_icon('chevron-lg-right', size: 12) - = render 'dashboard/projects_nav' +.top-area + .scrolling-tabs-container.inner-page-scroll-tabs.gl-flex-grow-1.gl-min-w-0.gl-w-full + .fade-left= sprite_icon('chevron-lg-left', size: 12) + .fade-right= sprite_icon('chevron-lg-right', size: 12) + = render 'dashboard/projects_nav' - unless feature_project_list_filter_bar .nav-controls = render 'shared/projects/search_form' diff --git a/app/views/dashboard/_projects_nav.html.haml b/app/views/dashboard/_projects_nav.html.haml index 90b40f3c7b7..29c820ddc58 100644 --- a/app/views/dashboard/_projects_nav.html.haml +++ b/app/views/dashboard/_projects_nav.html.haml @@ -1,7 +1,7 @@ - is_your_projects_path = current_page?(dashboard_projects_path) || current_page?(root_path) - is_explore_projects_path = current_page?(explore_root_path) || current_page?(trending_explore_projects_path) || current_page?(starred_explore_projects_path) || current_page?(explore_projects_path) -= gl_tabs_nav({ class: 'scrolling-tabs nav-links gl-display-flex gl-flex-grow-1 gl-flex-nowrap gl-border-0' }) do += gl_tabs_nav({ class: 'scrolling-tabs nav-links gl-display-flex gl-flex-grow-1 gl-w-full nav gl-tabs-nav' }) do = gl_tab_link_to dashboard_projects_path, { item_active: is_your_projects_path, class: 'shortcuts-activity', data: { placement: 'right' } } do = _("Your projects") = gl_tab_counter_badge(limited_counter_with_delimiter(@total_user_projects_count)) diff --git a/app/views/dashboard/_snippets_head.html.haml b/app/views/dashboard/_snippets_head.html.haml index 8c468812e33..be2124fdd7e 100644 --- a/app/views/dashboard/_snippets_head.html.haml +++ b/app/views/dashboard/_snippets_head.html.haml @@ -1,5 +1,5 @@ .page-title-holder.d-flex.align-items-center - %h1.page-title= _('Snippets') + %h1.page-title.gl-font-size-h-display= _('Snippets') - if current_user && current_user.snippets.any? || @snippets.any? .page-title-controls diff --git a/app/views/dashboard/issues.html.haml b/app/views/dashboard/issues.html.haml index f0216253dad..95e772f324b 100644 --- a/app/views/dashboard/issues.html.haml +++ b/app/views/dashboard/issues.html.haml @@ -7,7 +7,7 @@ = render_dashboard_ultimate_trial(current_user) .page-title-holder.d-flex.align-items-center - %h1.page-title= _('Issues') + %h1.page-title.gl-font-size-h-display= _('Issues') - if current_user .page-title-controls diff --git a/app/views/dashboard/merge_requests.html.haml b/app/views/dashboard/merge_requests.html.haml index 90fb09ed909..8a639d08a27 100644 --- a/app/views/dashboard/merge_requests.html.haml +++ b/app/views/dashboard/merge_requests.html.haml @@ -5,7 +5,7 @@ = render_dashboard_ultimate_trial(current_user) .page-title-holder.d-flex.align-items-start.flex-column.flex-sm-row.align-items-sm-center - %h1.page-title= _('Merge requests') + %h1.page-title.gl-font-size-h-display= _('Merge requests') - if current_user .page-title-controls.ml-0.mb-3.ml-sm-auto.mb-sm-0 diff --git a/app/views/dashboard/milestones/index.html.haml b/app/views/dashboard/milestones/index.html.haml index 2bbca851dcc..39fbd9bc097 100644 --- a/app/views/dashboard/milestones/index.html.haml +++ b/app/views/dashboard/milestones/index.html.haml @@ -4,7 +4,7 @@ - add_page_specific_style 'page_bundles/milestone' .page-title-holder.d-flex.align-items-center - %h1.page-title= _('Milestones') + %h1.page-title.gl-font-size-h-display= _('Milestones') - if current_user .page-title-controls diff --git a/app/views/dashboard/todos/index.html.haml b/app/views/dashboard/todos/index.html.haml index 4f6ddf10984..6bfe18fd3b2 100644 --- a/app/views/dashboard/todos/index.html.haml +++ b/app/views/dashboard/todos/index.html.haml @@ -7,7 +7,7 @@ - add_page_specific_style 'page_bundles/todos' .page-title-holder.d-flex.align-items-center - %h1.page-title= _("To-Do List") + %h1.page-title.gl-font-size-h-display= _("To-Do List") - if current_user.todos.any? .top-area |