Commit 2e8f4bf3 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge branch 'milestome-ui' into 'master'

Improve Milestome UI

Milestone UI header was different from Issue/MR pages but use same UI elements.
This MR fixes it so UI looks same for issue/mr/milestone
parents 761fbbfe 85c5a203
= render "projects/issues/head" = render "projects/issues/head"
%h3.page-title %h3.page-title
Milestone ##{@milestone.iid} Milestone ##{@milestone.iid}
%small
= @milestone.expires_at
.pull-right .pull-right
- if can?(current_user, :admin_milestone, @project) - if can?(current_user, :admin_milestone, @project)
= link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do
...@@ -23,14 +21,16 @@ ...@@ -23,14 +21,16 @@
.issue-box{ class: issue_box_class(@milestone) } .issue-box{ class: issue_box_class(@milestone) }
.state .state.clearfix
%span.state-label .state-label.col-sm-2.col-xs-12
- if @milestone.closed? - if @milestone.closed?
Closed Closed
- elsif @milestone.expired? - elsif @milestone.expired?
Expired Expired
- else - else
Open Open
%span.creator.col-sm-9.col-xs-12
= @milestone.expires_at
%h4.title %h4.title
= gfm escape_once(@milestone.title) = gfm escape_once(@milestone.title)
......
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