Commit 6b0199ff authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets
Browse files

Merge branch 'ui-improvements' into 'master'

UI improvements

* lighter color for comments count
* better UI for issue assigee.milestone block

See merge request !1551
parents abc65bbb 675f5954
......@@ -23,3 +23,19 @@
}
}
}
.issuable-context-title {
font-size: 15px;
line-height: 1.4;
margin-bottom: 5px;
.avatar {
margin-left: 0;
}
label {
color: #666;
font-weight: normal;
margin-right: 4px;
}
}
......@@ -171,9 +171,9 @@ form.edit-issue {
}
}
h3.issue-title {
h2.issue-title {
margin-top: 0;
font-size: 2em;
font-weight: bold;
}
.context .select2-container {
......
......@@ -169,7 +169,7 @@
color: #999;
background: #FFF;
padding: 5px;
margin-top: -7px;
margin-top: -11px;
border: 1px solid #DDD;
font-size: 13px;
}
......@@ -16,8 +16,9 @@
- note_count = notes.count
- if note_count > 0
%span.label.label-gray
%i.fa.fa-comment= note_count
%span.light
%i.fa.fa-comments
= note_count
- if commit.description?
.commit-row-description.js-toggle-content
......
......@@ -7,8 +7,7 @@
.row
.col-md-9
.participants
%cite.cgray
= pluralize(@issue.participants.count, 'participant')
%span= pluralize(@issue.participants.count, 'participant')
- @issue.participants.each do |participant|
= link_to_member(@project, participant, name: false, size: 24)
......@@ -20,8 +19,7 @@
= cross_project_reference(@project, @issue)
%hr
.context
%cite.cgray
= render partial: 'issue_context', locals: { issue: @issue }
= render partial: 'issue_context', locals: { issue: @issue }
%hr
.clearfix
.votes-holder
......
......@@ -6,7 +6,7 @@
.issue-title
%span.str-truncated
= link_to_gfm issue.title, project_issue_path(issue.project, issue), class: "row_title"
.pull-right
.pull-right.light
- if issue.closed?
%span
CLOSED
......
= form_for [@project, @issue], remote: true, html: {class: 'edit-issue inline-update'} do |f|
%div.prepend-top-20
%p
Assignee:
.issuable-context-title
%label
Assignee:
- if issue.assignee
= link_to_member(@project, @issue.assignee)
%strong= link_to_member(@project, @issue.assignee, size: 24)
- else
none
- if can?(current_user, :modify_issue, @issue)
= project_users_select_tag('issue[assignee_id]', placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: @issue.assignee_id)
%div.prepend-top-20
%p
Milestone:
%div.prepend-top-20.clearfix
.issuable-context-title
%label
Milestone:
- if issue.milestone
#{link_to @issue.milestone.title, project_milestone_path(@project, @issue.milestone)}
%span.back-to-milestone
= link_to project_milestone_path(@project, @issue.milestone) do
%strong
%i.fa.fa-clock-o
= @issue.milestone.title
- else
none
- if can?(current_user, :modify_issue, @issue)
......
......@@ -26,7 +26,7 @@
Edit
%hr
%h3.issue-title
%h2.issue-title
= gfm escape_once(@issue.title)
%div
- if @issue.description.present?
......
......@@ -16,8 +16,7 @@
= cross_project_reference(@project, @merge_request)
%hr
.context
%cite.cgray
= render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
= render partial: 'projects/merge_requests/show/context', locals: { merge_request: @merge_request }
%hr
.votes-holder
%h6 Votes
......
......@@ -2,7 +2,7 @@
.merge-request-title
%span.str-truncated
= link_to_gfm merge_request.title, project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
.pull-right
.pull-right.light
- if merge_request.merged?
%span
%i.fa.fa-check
......
= form_for [@project, @merge_request], remote: true, html: {class: 'edit-merge_request inline-update'} do |f|
%div.prepend-top-20
%p
Assignee:
.issuable-context-title
%label
Assignee:
- if @merge_request.assignee
= link_to_member(@project, @merge_request.assignee)
%strong= link_to_member(@project, @merge_request.assignee, size: 24)
- else
none
- if can?(current_user, :modify_merge_request, @merge_request)
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: @merge_request.assignee_id)
.issuable-context-selectbox
- if can?(current_user, :modify_merge_request, @merge_request)
= project_users_select_tag('merge_request[assignee_id]', placeholder: 'Select assignee', class: 'custom-form-control js-select2 js-assignee', selected: @merge_request.assignee_id)
%div.prepend-top-20
%p
Milestone:
%div.prepend-top-20.clearfix
.issuable-context-title
%label
Milestone:
- if @merge_request.milestone
%span.back-to-milestone
#{link_to @merge_request.milestone.title, project_milestone_path(@project, @merge_request.milestone)}
= link_to project_milestone_path(@project, @merge_request.milestone) do
%strong
%i.fa.fa-clock-o
= @merge_request.milestone.title
- else
none
- if can?(current_user, :modify_merge_request, @merge_request)
= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2 select2-compact js-select2 js-milestone'})
= hidden_field_tag :merge_request_context
= f.submit class: 'btn'
.issuable-context-selectbox
- if can?(current_user, :modify_merge_request, @merge_request)
= f.select(:milestone_id, milestone_options(@merge_request), { include_blank: "Select milestone" }, {class: 'select2 select2-compact js-select2 js-milestone'})
= hidden_field_tag :merge_request_context
= f.submit class: 'btn'
%h3.issue-title
%h2.issue-title
= gfm escape_once(@merge_request.title)
%div
......
.participants
%cite.cgray #{@merge_request.participants.count} participants
%span #{@merge_request.participants.count} participants
- @merge_request.participants.each do |participant|
= link_to_member(@project, participant, name: false, size: 24)
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