Skip to content
代码片段 群组 项目
提交 471785f4 编辑于 作者: Rajendra Kadam's avatar Rajendra Kadam
浏览文件

Merge branch 'update-illustrations-2-jmiocene' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
.row.empty-state .row.empty-state
.col-12 .col-12
.svg-content .svg-content.svg-150
= image_tag 'illustrations/milestone_burndown_chart.svg' = image_tag 'illustrations/empty-state/empty-milestone-md.svg'
.col-12 .col-12
.text-content.text-center .text-content.text-center
%h4= s_('Milestones|Use milestones to track issues and merge requests over a fixed period of time') %h4= s_('Milestones|Use milestones to track issues and merge requests over a fixed period of time')
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
.row.empty-state .row.empty-state
.col-12 .col-12
.svg-content .svg-content.svg-150
= image_tag 'illustrations/milestone_burndown_chart.svg' = image_tag 'illustrations/empty-state/empty-milestone-md.svg'
.col-12 .col-12
.text-content .text-content
- if closed_tab_selected - if closed_tab_selected
......
...@@ -165,6 +165,7 @@ export default { ...@@ -165,6 +165,7 @@ export default {
v-else v-else
:title="$options.i18n.emptyState.title" :title="$options.i18n.emptyState.title"
:svg-path="emptyOncallSchedulesSvgPath" :svg-path="emptyOncallSchedulesSvgPath"
:svg-height="150"
> >
<template #description> <template #description>
<p v-if="userCanCreateSchedule"> <p v-if="userCanCreateSchedule">
......
...@@ -49,6 +49,7 @@ export default { ...@@ -49,6 +49,7 @@ export default {
<div class="requirements-empty-state-container"> <div class="requirements-empty-state-container">
<gl-empty-state <gl-empty-state
:svg-path="emptyStatePath" :svg-path="emptyStatePath"
:svg-height="150"
:title="emptyStateTitle" :title="emptyStateTitle"
:description="emptyStateDescription" :description="emptyStateDescription"
> >
......
...@@ -5,7 +5,7 @@ module OncallScheduleHelper ...@@ -5,7 +5,7 @@ module OncallScheduleHelper
def oncall_schedule_data(project) def oncall_schedule_data(project)
{ {
'project-path' => project.full_path, 'project-path' => project.full_path,
'empty-oncall-schedules-svg-path' => image_path('illustrations/empty-state/empty-on-call.svg'), 'empty-oncall-schedules-svg-path' => image_path('illustrations/empty-state/empty-schedule-md.svg'),
'timezones' => timezone_data(format: :full).to_json, 'timezones' => timezone_data(format: :full).to_json,
'escalation-policies-path' => project_incident_management_escalation_policies_path(project), 'escalation-policies-path' => project_incident_management_escalation_policies_path(project),
'user_can_create_schedule' => can?(current_user, :admin_incident_management_oncall_schedule, project).to_s, 'user_can_create_schedule' => can?(current_user, :admin_incident_management_oncall_schedule, project).to_s,
......
...@@ -28,6 +28,6 @@ ...@@ -28,6 +28,6 @@
can_create_requirement: "#{can?(current_user, :create_requirement, @project)}", can_create_requirement: "#{can?(current_user, :create_requirement, @project)}",
description_preview_path: preview_markdown_path(@project), description_preview_path: preview_markdown_path(@project),
description_help_path: help_page_path('user/markdown'), description_help_path: help_page_path('user/markdown'),
empty_state_path: image_path('illustrations/empty-state/empty-requirements-lg.svg'), empty_state_path: image_path('illustrations/empty-todos-md.svg'),
requirements_import_csv_path: import_csv_project_requirements_management_requirements_path(@project) } } requirements_import_csv_path: import_csv_project_requirements_management_requirements_path(@project) } }
= gl_loading_icon(css_class: 'gl-mt-3', size: 'md') = gl_loading_icon(css_class: 'gl-mt-3', size: 'md')
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
it 'returns on-call schedule data' do it 'returns on-call schedule data' do
is_expected.to eq( is_expected.to eq(
'project-path' => project.full_path, 'project-path' => project.full_path,
'empty-oncall-schedules-svg-path' => helper.image_path('illustrations/empty-state/empty-on-call.svg'), 'empty-oncall-schedules-svg-path' => helper.image_path('illustrations/empty-state/empty-schedule-md.svg'),
'timezones' => helper.timezone_data(format: :full).to_json, 'timezones' => helper.timezone_data(format: :full).to_json,
'escalation-policies-path' => project_incident_management_escalation_policies_path(project), 'escalation-policies-path' => project_incident_management_escalation_policies_path(project),
'user_can_create_schedule' => 'false', 'user_can_create_schedule' => 'false',
......
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册