Commit 692aa783 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve issue and merge request lists UI

parent 906f8efd
...@@ -23,7 +23,25 @@ ...@@ -23,7 +23,25 @@
li.commit { li.commit {
padding: 8px 0; padding: 8px 0;
}
}
.commits-row-date {
font-size: 15px;
line-height: 20px;
margin-bottom: 5px;
}
}
.commits-feed-holder {
float: right;
.btn {
padding: 4px 12px;
}
}
li.commit {
.commit-row-title { .commit-row-title {
font-size: $list-font-size; font-size: $list-font-size;
line-height: 20px; line-height: 20px;
...@@ -44,9 +62,9 @@ ...@@ -44,9 +62,9 @@
} }
.commit-row-message { .commit-row-message {
color: #333;
&:hover {
color: #444; color: #444;
&:hover {
text-decoration: underline; text-decoration: underline;
} }
} }
...@@ -102,19 +120,4 @@ ...@@ -102,19 +120,4 @@
@extend .cgray; @extend .cgray;
} }
} }
}
}
.commits-row-date {
font-size: 15px;
line-height: 20px;
margin-bottom: 5px;
}
}
.commits-feed-holder {
float: right;
.btn {
padding: 4px 12px;
}
} }
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
.issue-title { .issue-title {
margin-bottom: 5px; margin-bottom: 5px;
font-size: $list-font-size; font-size: $list-font-size;
font-weight: bold;
} }
.issue-info { .issue-info {
......
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
.merge-request-title { .merge-request-title {
margin-bottom: 5px; margin-bottom: 5px;
font-size: $list-font-size; font-size: $list-font-size;
font-weight: bold;
} }
.merge-request-info { .merge-request-info {
......
...@@ -6,9 +6,15 @@ ...@@ -6,9 +6,15 @@
.issue-title .issue-title
%span.str-truncated %span.str-truncated
= link_to_gfm issue.title, project_issue_path(issue.project, issue), class: "row_title" = link_to_gfm issue.title, project_issue_path(issue.project, issue), class: "row_title"
.pull-right
- if issue.closed? - if issue.closed?
%small.pull-right %span
CLOSED CLOSED
- if issue.notes.any?
 
%span
%i.fa.fa-comments
= issue.notes.count
.issue-info .issue-info
%span.light= "##{issue.iid}" %span.light= "##{issue.iid}"
...@@ -16,10 +22,6 @@ ...@@ -16,10 +22,6 @@
assigned to #{link_to_member(@project, issue.assignee)} assigned to #{link_to_member(@project, issue.assignee)}
- if issue.votes_count > 0 - if issue.votes_count > 0
= render 'votes/votes_inline', votable: issue = render 'votes/votes_inline', votable: issue
- if issue.notes.any?
%span
%i.fa.fa-comments
= issue.notes.count
- if issue.milestone - if issue.milestone
%span %span
%i.fa.fa-clock-o %i.fa.fa-clock-o
......
%li{ class: mr_css_classes(merge_request) } %li{ class: mr_css_classes(merge_request) }
.merge-request-title .merge-request-title
= link_to_gfm truncate(merge_request.title, length: 80), project_merge_request_path(merge_request.target_project, merge_request), class: "row_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
- if merge_request.merged? - if merge_request.merged?
%small.pull-right %span
%i.fa.fa-check %i.fa.fa-check
MERGED MERGED
- elsif merge_request.closed?
%span
%i.fa.fa-close
CLOSED
- else - else
%span.pull-right.hidden-xs %span.hidden-xs.hidden-sm
- if merge_request.for_fork? %span.label-branch<
%span.light %i.fa.fa-code-fork
#{merge_request.source_project_namespace}: %span= merge_request.target_branch
= truncate merge_request.source_branch, length: 25 - if merge_request.notes.any?
%i.fa.fa-angle-right.light &nbsp;
= merge_request.target_branch %span
%i.fa.fa-comments
= merge_request.mr_and_commit_notes.count
.merge-request-info .merge-request-info
%span.light= "##{merge_request.iid}" %span.light= "##{merge_request.iid}"
- if merge_request.assignee - if merge_request.assignee
...@@ -21,10 +29,6 @@ ...@@ -21,10 +29,6 @@
Unassigned Unassigned
- if merge_request.votes_count > 0 - if merge_request.votes_count > 0
= render 'votes/votes_inline', votable: merge_request = render 'votes/votes_inline', votable: merge_request
- if merge_request.notes.any?
%span
%i.fa.fa-comments
= merge_request.mr_and_commit_notes.count
- if merge_request.milestone_id? - if merge_request.milestone_id?
%span %span
%i.fa.fa-clock-o %i.fa.fa-clock-o
...@@ -33,6 +37,7 @@ ...@@ -33,6 +37,7 @@
%span.task-status %span.task-status
= merge_request.task_status = merge_request.task_status
.pull-right.hidden-xs .pull-right.hidden-xs
%small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')} %small updated #{time_ago_with_tooltip(merge_request.updated_at, 'bottom', 'merge_request_updated_ago')}
......
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