Commit e45d72b4 authored by Annabel Dunstone Gray's avatar Annabel Dunstone Gray

Merge branch 'align-epics-empty-state-buttons' into 'master'

Resolve "Align epics and roadmap empty state buttons to the center"

Closes #7574

See merge request gitlab-org/gitlab-ee!7358
parents 0a30b12b 964c3f1a
...@@ -109,17 +109,19 @@ export default { ...@@ -109,17 +109,19 @@ export default {
<div class="text-content"> <div class="text-content">
<h4>{{ message }}</h4> <h4>{{ message }}</h4>
<p v-html="subMessage"></p> <p v-html="subMessage"></p>
<new-epic <div class="text-center">
v-if="!hasFiltersApplied" <new-epic
:endpoint="newEpicEndpoint" v-if="!hasFiltersApplied"
/> :endpoint="newEpicEndpoint"
<a />
:title="__('List')" <a
:href="newEpicEndpoint" :title="__('List')"
class="btn btn-default" :href="newEpicEndpoint"
> class="btn btn-default"
<span>{{ s__('View epics list') }}</span> >
</a> <span>{{ s__('View epics list') }}</span>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -17,4 +17,5 @@ ...@@ -17,4 +17,5 @@
- else - else
= _('Track groups of issues that share a theme, across projects and milestones') = _('Track groups of issues that share a theme, across projects and milestones')
- if can?(current_user, :create_epic, @group) - if can?(current_user, :create_epic, @group)
#new-epic-app{ data: { endpoint: request.url } } .text-center
#new-epic-app{ data: { endpoint: request.url } }
...@@ -8,7 +8,8 @@ ...@@ -8,7 +8,8 @@
= _('The roadmap shows the progress of your epics along a timeline') = _('The roadmap shows the progress of your epics along a timeline')
%p %p
= _('To view the roadmap, add a planned start or finish date to one of your epics in this group or its subgroups. Only epics in the past 3 months and the next 3 months are shown.') = _('To view the roadmap, add a planned start or finish date to one of your epics in this group or its subgroups. Only epics in the past 3 months and the next 3 months are shown.')
- if can?(current_user, :create_epic, @group) .text-center
#new-epic-app{ data: { endpoint: request.url } } - if can?(current_user, :create_epic, @group)
= link_to group_epics_path(@group), title: 'List', class: 'btn' do #new-epic-app{ data: { endpoint: request.url } }
%span= _('View epics list') = link_to group_epics_path(@group), title: 'List', class: 'btn' do
%span= _('View epics list')
---
title: Align epics and roadmap empty state buttons to the center
merge_request: 7358
author: George Tsiolis
type: fixed
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment