Commit 2e8f4bf39203f4c24ab6fb053b1bd5f3c7a20b86
Exists in
spb-stable
and in
2 other branches
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
Showing
1 changed file
with
4 additions
and
4 deletions
Show diff stats
app/views/projects/milestones/show.html.haml
| 1 | = render "projects/issues/head" | 1 | = render "projects/issues/head" |
| 2 | %h3.page-title | 2 | %h3.page-title |
| 3 | Milestone ##{@milestone.iid} | 3 | Milestone ##{@milestone.iid} |
| 4 | - %small | ||
| 5 | - = @milestone.expires_at | ||
| 6 | .pull-right | 4 | .pull-right |
| 7 | - if can?(current_user, :admin_milestone, @project) | 5 | - if can?(current_user, :admin_milestone, @project) |
| 8 | = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do | 6 | = link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-grouped" do |
| @@ -23,14 +21,16 @@ | @@ -23,14 +21,16 @@ | ||
| 23 | 21 | ||
| 24 | 22 | ||
| 25 | .issue-box{ class: issue_box_class(@milestone) } | 23 | .issue-box{ class: issue_box_class(@milestone) } |
| 26 | - .state | ||
| 27 | - %span.state-label | 24 | + .state.clearfix |
| 25 | + .state-label.col-sm-2.col-xs-12 | ||
| 28 | - if @milestone.closed? | 26 | - if @milestone.closed? |
| 29 | Closed | 27 | Closed |
| 30 | - elsif @milestone.expired? | 28 | - elsif @milestone.expired? |
| 31 | Expired | 29 | Expired |
| 32 | - else | 30 | - else |
| 33 | Open | 31 | Open |
| 32 | + %span.creator.col-sm-9.col-xs-12 | ||
| 33 | + = @milestone.expires_at | ||
| 34 | 34 | ||
| 35 | %h4.title | 35 | %h4.title |
| 36 | = gfm escape_once(@milestone.title) | 36 | = gfm escape_once(@milestone.title) |