Push events polished

Dmitriy Zaporozhets
1 parent cadf12c6
Showing 5 changed files with 21 additions and 9 deletions Show diff stats
app/assets/stylesheets/common.scss
app/views/events/_commit.html.haml
app/views/events/_event_changed_merge_request.html.haml
app/views/events/_event_new_merge_request.html.haml
app/views/events/_event_push.html.haml
@@ -871,7 +871,7 @@ p.time {
 .event_feed { 
   min-height:40px;
-  border-bottom:1px solid #eee;
+  border-bottom:1px solid #ddd;
   .avatar { 
     width:32px;
   }
@@ -884,8 +884,6 @@ p.time {
   }
   padding: 15px 5px;
-  border-bottom: 1px solid #eee;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.05);
   &:last-child { border:none }
   .wll:hover { background:none }
 }
@@ -0,0 +1,9 @@
+%li.wll.commit
+  = link_to project_commit_path(project, :id => commit.id) do
+    %p
+      %code.left= commit.id.to_s[0..10]
+      %strong.cgray= commit.author_name
+      &ndash;
+      = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
+      %span.row_title= truncate(commit.safe_message, :length => 50) rescue "--broken encoding"
+
@@ -13,6 +13,7 @@ at
 %span.cgray
   = time_ago_in_words(event.created_at)
   ago.
+%br
 %span.label= event.merge_request.source_branch
 &rarr;
 %span.label= event.merge_request.target_branch
@@ -9,6 +9,7 @@ at
 %span.cgray
   = time_ago_in_words(event.created_at)
   ago.
+%br
 %span.label= event.merge_request.source_branch
 &rarr;
 %span.label= event.merge_request.target_branch
@@ -30,13 +30,16 @@
     ago.
   - if event.commits.count > 1
     = link_to compare_project_commits_path(event.project, :from => event.commits.first.prev_commit_id, :to => event.commits.last.id) do 
-      Compare #{event.commits.first.commit.id[0..8]}...#{event.commits.last.id[0..8]}
-  - @project = event.project  
+      %strong #{event.commits.first.commit.id[0..7]}...#{event.commits.last.id[0..7]}
+  - project = event.project  
   %ul.unstyled.event_commits
     - if event.commits.size > 3
-      = render event.commits[0...2]
-      %li ... and #{event.commits.size - 2} more commits
+      - event.commits[0...2].each do |commit|
+        = render "events/commit", :commit => commit, :project => project
+      %li
+        %br
+        \... and #{event.commits.size - 2} more commits
     - else 
-      = render event.commits
-
+      - event.commits.each do |commit|
+        = render "events/commit", :commit => commit, :project => project
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+%li.wll.commit
	2	+ = link_to project_commit_path(project, :id => commit.id) do
	3	+ %p
	4	+ %code.left= commit.id.to_s[0..10]
	5	+ %strong.cgray= commit.author_name
	6	+ –
	7	+ = image_tag gravatar_icon(commit.author_email), :class => "avatar", :width => 16
	8	+ %span.row_title= truncate(commit.safe_message, :length => 50) rescue "--broken encoding"
	9	+
	@@ -13,6 +13,7 @@ at		@@ -13,6 +13,7 @@ at
13	%span.cgray	13	%span.cgray
14	= time_ago_in_words(event.created_at)	14	= time_ago_in_words(event.created_at)
15	ago.	15	ago.
		16	+%br
16	%span.label= event.merge_request.source_branch	17	%span.label= event.merge_request.source_branch
17	→	18	→
18	%span.label= event.merge_request.target_branch	19	%span.label= event.merge_request.target_branch
	@@ -9,6 +9,7 @@ at		@@ -9,6 +9,7 @@ at
9	%span.cgray	9	%span.cgray
10	= time_ago_in_words(event.created_at)	10	= time_ago_in_words(event.created_at)
11	ago.	11	ago.
		12	+%br
12	%span.label= event.merge_request.source_branch	13	%span.label= event.merge_request.source_branch
13	→	14	→
14	%span.label= event.merge_request.target_branch	15	%span.label= event.merge_request.target_branch