Commit 63d5fcc8 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

UI: allign milestone to right for issue, mr show page

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent d1e84958
...@@ -51,3 +51,7 @@ ...@@ -51,3 +51,7 @@
.chosen-container .chosen-drop .chosen-search input { .chosen-container .chosen-drop .chosen-search input {
background-position-y: -24px !important; background-position-y: -24px !important;
} }
.chosen-compact {
max-width: 170px !important;
}
...@@ -11,14 +11,16 @@ ...@@ -11,14 +11,16 @@
- elsif issue.assignee - elsif issue.assignee
= link_to_member(@project, @issue.assignee) = link_to_member(@project, @issue.assignee)
- if issue.milestone
- milestone = issue.milestone
%cite.cgray and attached to milestone
- if can?(current_user, :modify_issue, @issue) .pull-right
= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone (none):" }, {class: 'chosen'}) - if issue.milestone
- milestone = issue.milestone
%cite.cgray Attached to milestone
- if can?(current_user, :modify_issue, @issue)
= f.select(:milestone_id, milestone_options(@issue), { include_blank: "Select milestone (none):" }, {class: 'chosen chosen-compact'})
= hidden_field_tag :issue_context = hidden_field_tag :issue_context
= f.submit class: 'btn' = f.submit class: 'btn'
- elsif issue.milestone - elsif issue.milestone
= link_to issue.milestone.title, project_milestone_path = link_to issue.milestone.title, project_milestone_path
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
- if @merge_request.assignee - if @merge_request.assignee
Currently assigned to #{link_to_member(@project, @merge_request.assignee)}. Currently assigned to #{link_to_member(@project, @merge_request.assignee)}.
- if @merge_request.milestone - if @merge_request.milestone
- milestone = @merge_request.milestone .pull-right
%cite.cgray Attached to milestone - milestone = @merge_request.milestone
%strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone) %cite.cgray Attached to milestone
\. %strong= link_to_gfm truncate(milestone.title, length: 20), project_milestone_path(milestone.project, milestone)
- if @merge_request.description.present? - if @merge_request.description.present?
......
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