summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authortauriedavis <taurie@gitlab.com>2017-06-05 16:22:46 -0700
committertauriedavis <taurie@gitlab.com>2017-06-05 16:22:46 -0700
commit2edd327b27c4ee7e985cf27e5fe95ad21709dc53 (patch)
tree42e96ac1fead9699272775f083455a5b9000e024 /app/views
parent5578506eb1e7e911fa7b283e81b3751be370977b (diff)
downloadgitlab-ce-2edd327b27c4ee7e985cf27e5fe95ad21709dc53.tar.gz
Clean up issuable list and make responsive
Diffstat (limited to 'app/views')
-rw-r--r--app/views/projects/issues/_issue.html.haml60
1 files changed, 33 insertions, 27 deletions
diff --git a/app/views/projects/issues/_issue.html.haml b/app/views/projects/issues/_issue.html.haml
index c184e0e0022..78f8c572a31 100644
--- a/app/views/projects/issues/_issue.html.haml
+++ b/app/views/projects/issues/_issue.html.haml
@@ -8,39 +8,45 @@
%span.issue-title-text
= confidential_icon(issue)
= link_to issue.title, issue_path(issue)
- %ul.controls
- - if issue.closed?
- %li
- CLOSED
-
- - if issue.assignees.any?
- %li
- = render 'shared/issuable/assignees', project: @project, issue: issue
-
- = render 'shared/issuable_meta_data', issuable: issue
+ - if issue.tasks?
+ %span.task-status
+ &nbsp;
+ = issue.task_status
+
+
.issue-info
- #{issuable_reference(issue)} &middot;
- opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
- by #{link_to_member(@project, issue.author, avatar: false)}
- - if issue.milestone
+ %span.issue-reference
+ #{issuable_reference(issue)}
+ %span.issue-authored
+ &middot;
+ opened #{time_ago_with_tooltip(issue.created_at, placement: 'bottom')}
+ by #{link_to_member(@project, issue.author, avatar: false)}
&nbsp;
- = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
- = icon('clock-o')
- = issue.milestone.title
- - if issue.due_date
- %span{ class: "#{'cred' if issue.overdue?}" }
+ - if issue.milestone
+ %span.issue-milestone
+ = link_to namespace_project_issues_path(issue.project.namespace, issue.project, milestone_title: issue.milestone.title) do
+ = icon('clock-o')
+ = issue.milestone.title
&nbsp;
+ - if issue.due_date
+ %span.issue-due-date{ class: "#{'cred' if issue.overdue?}" }
= icon('calendar')
= issue.due_date.to_s(:medium)
+ &nbsp;
- if issue.labels.any?
- &nbsp;
- issue.labels.each do |label|
- = link_to_label(label, subject: issue.project, css_class: 'label-link')
- - if issue.tasks?
- &nbsp;
- %span.task-status
- = issue.task_status
+ = link_to_label(label, subject: issue.project, css_class: 'label-link')
+ .issuable-meta
+ %ul.controls
+ - if issue.closed?
+ %li
+ CLOSED
+
+ - if issue.assignees.any?
+ %li
+ = render 'shared/issuable/assignees', project: @project, issue: issue
- .pull-right.issue-updated-at
- %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}
+ = render 'shared/issuable_meta_data', issuable: issue
+ .pull-right.issue-updated-at
+ %span updated #{time_ago_with_tooltip(issue.updated_at, placement: 'bottom', html_class: 'issue_update_ago')}