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

Improve issue and merge request lists UI

parent 906f8efd
...@@ -23,85 +23,6 @@ ...@@ -23,85 +23,6 @@
li.commit { li.commit {
padding: 8px 0; padding: 8px 0;
.commit-row-title {
font-size: $list-font-size;
line-height: 20px;
margin-bottom: 2px;
.notes_count {
float: right;
margin-right: 10px;
}
.commit_short_id {
min-width: 65px;
font-family: $monospace_font;
}
.str-truncated {
max-width: 70%;
}
.commit-row-message {
color: #333;
&:hover {
color: #444;
text-decoration: underline;
}
}
.text-expander {
background: #eee;
color: #555;
padding: 0 5px;
cursor: pointer;
margin-left: 4px;
&:hover {
background-color: #ddd;
}
}
}
.commit-row-description {
font-size: 14px;
border-left: 1px solid #EEE;
padding: 10px 15px;
margin: 5px 0 10px 5px;
background: #f9f9f9;
display: none;
pre {
border: none;
background: inherit;
padding: 0;
margin: 0;
}
}
.commit-row-info {
color: #777;
line-height: 24px;
a {
color: #777;
}
.committed_ago {
display: inline-block;
}
}
&.inline-commit {
.commit-row-title {
font-size: 13px;
}
.committed_ago {
float: right;
@extend .cgray;
}
}
} }
} }
...@@ -114,7 +35,89 @@ ...@@ -114,7 +35,89 @@
.commits-feed-holder { .commits-feed-holder {
float: right; float: right;
.btn { .btn {
padding: 4px 12px; padding: 4px 12px;
} }
} }
li.commit {
.commit-row-title {
font-size: $list-font-size;
line-height: 20px;
margin-bottom: 2px;
.notes_count {
float: right;
margin-right: 10px;
}
.commit_short_id {
min-width: 65px;
font-family: $monospace_font;
}
.str-truncated {
max-width: 70%;
}
.commit-row-message {
color: #444;
&:hover {
text-decoration: underline;
}
}
.text-expander {
background: #eee;
color: #555;
padding: 0 5px;
cursor: pointer;
margin-left: 4px;
&:hover {
background-color: #ddd;
}
}
}
.commit-row-description {
font-size: 14px;
border-left: 1px solid #EEE;
padding: 10px 15px;
margin: 5px 0 10px 5px;
background: #f9f9f9;
display: none;
pre {
border: none;
background: inherit;
padding: 0;
margin: 0;
}
}
.commit-row-info {
color: #777;
line-height: 24px;
a {
color: #777;
}
.committed_ago {
display: inline-block;
}
}
&.inline-commit {
.commit-row-title {
font-size: 13px;
}
.committed_ago {
float: right;
@extend .cgray;
}
}
}
...@@ -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"
- if issue.closed? .pull-right
%small.pull-right - if issue.closed?
CLOSED %span
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
- if merge_request.merged? = link_to_gfm merge_request.title, project_merge_request_path(merge_request.target_project, merge_request), class: "row_title"
%small.pull-right .pull-right
%i.fa.fa-check - if merge_request.merged?
MERGED %span
- else %i.fa.fa-check
%span.pull-right.hidden-xs MERGED
- if merge_request.for_fork? - elsif merge_request.closed?
%span.light %span
#{merge_request.source_project_namespace}: %i.fa.fa-close
= truncate merge_request.source_branch, length: 25 CLOSED
%i.fa.fa-angle-right.light - else
= merge_request.target_branch %span.hidden-xs.hidden-sm
%span.label-branch<
%i.fa.fa-code-fork
%span= merge_request.target_branch
- if merge_request.notes.any?
&nbsp;
%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