Commit c3efcf7a authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Pollished push event

parent c3907bef
......@@ -50,7 +50,7 @@
}
.event-body {
p {
color:#666;
color:#555;
}
.event-info {
color:#666;
......@@ -73,7 +73,8 @@
margin-left:50px;
margin-bottom:5px;
.avatar {
width:22px;
width:18px;
margin-top:3px;
}
}
......@@ -84,10 +85,17 @@
.event_commits {
margin-top: 5px;
li.commit {
background: transparent;
padding:5px;
border:none;
li {
&.commit {
background: transparent;
padding:3px;
border:none;
font-size:12px;
}
&.commits-stat {
display: block;
margin-top: 5px;
}
}
}
}
......
......@@ -9,22 +9,18 @@
%strong= event.ref_name
at
%strong= link_to event.project.name, event.project
- if event.push_with_commits?
- if event.commits_count > 1
= link_to compare_project_commits_path(event.project, from: event.parent_commit.id, to: event.last_commit.id) do
%strong #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
- if event.push_with_commits?
- project = event.project
.event-body
%ul.unstyled.event_commits
- if event.commits_count > 3
- event.commits[0...2].each do |commit|
= render "events/commit", commit: commit, project: project
%li
%br
\... and #{event.commits_count - 2} more commits
- else
- event.commits.each do |commit|
= render "events/commit", commit: commit, project: project
- few_commits = event.commits[0...2]
- few_commits.each do |commit|
= render "events/commit", commit: commit, project: project
%li.commits-stat
- if event.commits_count > 2
%span ... and #{event.commits_count - 2} more commits.
= link_to compare_project_commits_path(event.project, from: event.parent_commit.id, to: event.last_commit.id) do
%strong Compare → #{event.parent_commit.id[0..7]}...#{event.last_commit.id[0..7]}
.clearfix
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