diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-20 13:30:42 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-20 13:30:42 +0000 |
| commit | 2e8f4bf39203f4c24ab6fb053b1bd5f3c7a20b86 (patch) | |
| tree | a909a983987434285326ac70a9179a30b03d240d | |
| parent | 761fbbfeea5653e8d01e2d3d7fc936031ad39385 (diff) | |
| parent | 85c5a20352c7e739859eae8ad972f08fc61592b0 (diff) | |
| download | gitlab-ce-2e8f4bf39203f4c24ab6fb053b1bd5f3c7a20b86.tar.gz | |
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
| -rw-r--r-- | app/views/projects/milestones/show.html.haml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/views/projects/milestones/show.html.haml b/app/views/projects/milestones/show.html.haml index 5c5df46d33d..0fe5ac25b5e 100644 --- a/app/views/projects/milestones/show.html.haml +++ b/app/views/projects/milestones/show.html.haml @@ -1,8 +1,6 @@ = render "projects/issues/head" %h3.page-title Milestone ##{@milestone.iid} - %small - = @milestone.expires_at .pull-right - if can?(current_user, :admin_milestone, @project) = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do @@ -23,14 +21,16 @@ .issue-box{ class: issue_box_class(@milestone) } - .state - %span.state-label + .state.clearfix + .state-label.col-sm-2.col-xs-12 - if @milestone.closed? Closed - elsif @milestone.expired? Expired - else Open + %span.creator.col-sm-9.col-xs-12 + = @milestone.expires_at %h4.title = gfm escape_once(@milestone.title) |