Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
d4d2e9de
Commit
d4d2e9de
authored
May 20, 2019
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix layout of group milestone header
parent
7115bd81
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
12 deletions
+20
-12
app/views/shared/milestones/_top.html.haml
app/views/shared/milestones/_top.html.haml
+15
-12
changelogs/unreleased/60750-milestone-header.yml
changelogs/unreleased/60750-milestone-header.yml
+5
-0
No files found.
app/views/shared/milestones/_top.html.haml
View file @
d4d2e9de
...
@@ -4,10 +4,7 @@
...
@@ -4,10 +4,7 @@
-
group
=
local_assigns
[
:group
]
-
group
=
local_assigns
[
:group
]
-
is_dynamic_milestone
=
milestone
.
legacy_group_milestone?
||
milestone
.
dashboard_milestone?
-
is_dynamic_milestone
=
milestone
.
legacy_group_milestone?
||
milestone
.
dashboard_milestone?
.detail-page-header
.detail-page-header.milestone-page-header
%a
.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
.status-box
{
class:
"status-box-#{milestone.closed? ? 'closed' : 'open'}"
}
.status-box
{
class:
"status-box-#{milestone.closed? ? 'closed' : 'open'}"
}
-
if
milestone
.
closed?
-
if
milestone
.
closed?
Closed
Closed
...
@@ -15,14 +12,17 @@
...
@@ -15,14 +12,17 @@
Expired
Expired
-
else
-
else
Open
Open
%span
.identifier
Milestone
#{
milestone
.
title
}
.header-text-content
-
if
milestone
.
due_date
||
milestone
.
start_date
%span
.identifier
%span
.creator
Milestone
#{
milestone
.
title
}
·
-
if
milestone
.
due_date
||
milestone
.
start_date
=
milestone_date_range
(
milestone
)
%span
.creator
-
if
group
·
.float-right
=
milestone_date_range
(
milestone
)
.milestone-buttons
-
if
group
-
if
can?
(
current_user
,
:admin_milestone
,
group
)
-
if
can?
(
current_user
,
:admin_milestone
,
group
)
-
if
milestone
.
group_milestone?
-
if
milestone
.
group_milestone?
=
link_to
edit_group_milestone_path
(
group
,
milestone
),
class:
"btn btn btn-grouped"
do
=
link_to
edit_group_milestone_path
(
group
,
milestone
),
class:
"btn btn btn-grouped"
do
...
@@ -35,6 +35,9 @@
...
@@ -35,6 +35,9 @@
-
unless
is_dynamic_milestone
-
unless
is_dynamic_milestone
=
render
'shared/milestones/delete_button'
=
render
'shared/milestones/delete_button'
%a
.btn.btn-default.btn-grouped.float-right.d-block.d-sm-none.js-sidebar-toggle
{
href:
"#"
}
=
icon
(
'angle-double-left'
)
=
render
'shared/milestones/deprecation_message'
if
is_dynamic_milestone
=
render
'shared/milestones/deprecation_message'
if
is_dynamic_milestone
.detail-page-description.milestone-detail
.detail-page-description.milestone-detail
...
...
changelogs/unreleased/60750-milestone-header.yml
0 → 100644
View file @
d4d2e9de
---
title
:
Fix layout of group milestone header
merge_request
:
author
:
type
:
fixed
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment