Fix styling issues.

This commit is contained in:
Marin Jankovski 2014-06-30 13:27:17 +02:00
parent d3796b84f8
commit fdbf77ef99
5 changed files with 13 additions and 20 deletions

View File

@ -11,8 +11,3 @@
.milestone-row {
@include str-truncated(90%);
}
.label.label-default.project-name {
width: 80px;
@include str-truncated(80%);
}

View File

@ -18,27 +18,27 @@ class GroupMilestone
end
def projects
milestones.map{ |milestone| milestone.project }
milestones.map { |milestone| milestone.project }
end
def issue_count
milestones.map{ |milestone| milestone.issues.count }.sum
milestones.map { |milestone| milestone.issues.count }.sum
end
def merge_requests_count
milestones.map{ |milestone| milestone.merge_requests.count }.sum
milestones.map { |milestone| milestone.merge_requests.count }.sum
end
def open_items_count
milestones.map{ |milestone| milestone.open_items_count }.sum
milestones.map { |milestone| milestone.open_items_count }.sum
end
def closed_items_count
milestones.map{ |milestone| milestone.closed_items_count }.sum
milestones.map { |milestone| milestone.closed_items_count }.sum
end
def total_items_count
milestones.map{ |milestone| milestone.total_items_count }.sum
milestones.map { |milestone| milestone.total_items_count }.sum
end
def percent_complete
@ -48,7 +48,7 @@ class GroupMilestone
end
def state
state = milestones.map{ |milestone| milestone.state }
state = milestones.map { |milestone| milestone.state }
if state.count('active') == state.size
'active'
@ -66,15 +66,15 @@ class GroupMilestone
end
def issues
@group_issues ||= milestones.map{ |milestone| milestone.issues }.flatten.group_by(&:state)
@group_issues ||= milestones.map { |milestone| milestone.issues }.flatten.group_by(&:state)
end
def merge_requests
@group_merge_requests ||= milestones.map{ |milestone| milestone.merge_requests }.flatten.group_by(&:state)
@group_merge_requests ||= milestones.map { |milestone| milestone.merge_requests }.flatten.group_by(&:state)
end
def participants
milestones.map{ |milestone| milestone.participants.uniq }.reject(&:empty?).flatten
milestones.map { |milestone| milestone.participants.uniq }.reject(&:empty?).flatten
end
def opened_issues

View File

@ -17,7 +17,7 @@ module Milestones
end
end
private
private
def build(milestone)
milestone.map{ |title, milestones| GroupMilestone.new(title, milestones) }

View File

@ -1,8 +1,7 @@
%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid }
%span.milestone-row
- project = issue.project
%span.label.label-default.project-name
= project.name
%strong #{project.name} ·
= link_to [project, issue] do
%span.cgray ##{issue.iid}
= link_to_gfm issue.title, [project, issue]

View File

@ -1,8 +1,7 @@
%li{ id: dom_id(merge_request, 'sortable'), class: 'mr-row', 'data-iid' => merge_request.iid }
%span.milestone-row
- project = merge_request.project
%span.label.label-default.project-name
= project.name
%strong #{project.name} ·
= link_to [project, merge_request] do
%span.cgray ##{merge_request.iid}
= link_to_gfm merge_request.title, [project, merge_request]