diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-15 00:16:44 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-04-15 00:16:44 +0000 |
| commit | 9b0b4d9b9484aaeb82de5f24942460c679ae909e (patch) | |
| tree | 3067ba8367840be4195b619acbe5b28b6c7f11f3 /app/views/shared | |
| parent | 6df3cf6b4acbfe83f7a19e40bbd1471af5d6ce95 (diff) | |
| download | gitlab-ce-9b0b4d9b9484aaeb82de5f24942460c679ae909e.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/shared')
| -rw-r--r-- | app/views/shared/empty_states/_labels.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/empty_states/_topics.html.haml | 4 | ||||
| -rw-r--r-- | app/views/shared/projects/_list.html.haml | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/app/views/shared/empty_states/_labels.html.haml b/app/views/shared/empty_states/_labels.html.haml index e96fcd11cef..da88c139a6e 100644 --- a/app/views/shared/empty_states/_labels.html.haml +++ b/app/views/shared/empty_states/_labels.html.haml @@ -1,7 +1,7 @@ .row.empty-state.labels .col-12 - .svg-content{ data: { qa_selector: 'label_svg_content' } } - = image_tag 'illustrations/labels.svg' + .svg-content.svg-150{ data: { qa_selector: 'label_svg_content' } } + = image_tag 'illustrations/empty-state/empty-labels-md.svg' .col-12 .text-content %h4= _("Labels can be applied to issues and merge requests to categorize them.") diff --git a/app/views/shared/empty_states/_topics.html.haml b/app/views/shared/empty_states/_topics.html.haml index 0283e852c7d..cd60d966d71 100644 --- a/app/views/shared/empty_states/_topics.html.haml +++ b/app/views/shared/empty_states/_topics.html.haml @@ -1,7 +1,7 @@ .row.empty-state .col-12 - .svg-content - = image_tag 'illustrations/labels.svg' + .svg-content.svg-150 + = image_tag 'illustrations/empty-state/empty-labels-md.svg' .text-content.gl-text-center.gl-pt-0! %h4= _('There are no topics to show.') %p= _('Add topics to projects to help users find them.') diff --git a/app/views/shared/projects/_list.html.haml b/app/views/shared/projects/_list.html.haml index 0c18b2421f1..a2c831bfd1c 100644 --- a/app/views/shared/projects/_list.html.haml +++ b/app/views/shared/projects/_list.html.haml @@ -10,7 +10,6 @@ - skip_pagination = false unless local_assigns[:skip_pagination] == true - compact_mode = false unless local_assigns[:compact_mode] == true - css_classes = "#{'compact' if compact_mode} #{'explore' if explore_projects_tab?}" -- contributed_projects_illustration_path = 'illustrations/profile-page/contributed-projects.svg' - contributed_projects_current_user_empty_message_header = s_('UserProfile|Explore public groups to find projects to contribute to.') - contributed_projects_visitor_empty_message = s_('UserProfile|This user hasn\'t contributed to any projects') - starred_projects_illustration_path = 'illustrations/empty-state/empty-projects-starred-md.svg' @@ -43,7 +42,7 @@ = paginate_collection(projects, remote: remote) unless skip_pagination - else - if @contributed_projects - = render partial: 'shared/empty_states/profile_tabs', locals: { illustration_path: contributed_projects_illustration_path, + = render partial: 'shared/empty_states/profile_tabs', locals: { illustration_path: own_projects_illustration_path, current_user_empty_message_header: contributed_projects_current_user_empty_message_header, primary_button_label: new_project_button_label, primary_button_link: new_project_button_link, |