Event feed: Icons for some events

Dmitriy Zaporozhets
1 parent 1e4d15b4
Showing 7 changed files with 11 additions and 2 deletions Show diff stats
app/assets/images/event_mr_merged.png
app/assets/images/event_push.png
app/assets/stylesheets/common.scss
app/assets/stylesheets/ui_basic.scss
app/assets/stylesheets/ui_mars.scss
app/views/events/_event_merge_request.html.haml
app/views/events/_event_push.html.haml
@@ -645,6 +645,13 @@ p.time {
   .avatar { 
     width:32px;
   }
+  .event_icon { 
+    float:right;
+    margin-right:2px;
+    img { 
+      width:20px;
+    }
+  }
   ul { 
     margin-left:50px;
     margin-bottom:5px;
@@ -83,7 +83,6 @@
  
     .project_name {
       float:left;
-      width:360px;
       margin:0;
       margin-right:30px;
       font-size:20px;
@@ -97,7 +97,6 @@
     }
     .project_name {
       float:left;
-      width:360px;
       margin:0;
       margin-right:30px;
       font-size:20px;
+- if event.action_name == "merged"
+  .event_icon= image_tag "event_mr_merged.png"
 = image_tag gravatar_icon(event.author_email), :class => "avatar"
 %strong #{event.author_name} 
 %span.event_label= event.action_name
 %div
+  .event_icon= image_tag "event_push.png"
   = image_tag gravatar_icon(event.author_email), :class => "avatar"
   %strong #{event.author_name} 
   %span.event_label= event.push_action_name
+  = event.ref_type
   = link_to project_commits_path(event.project, :ref => event.ref_name) do
     %strong= event.ref_name
   at
...	...	@@ -645,6 +645,13 @@ p.time {
645	645	.avatar {
646	646	width:32px;
647	647	}
	648	+ .event_icon {
	649	+ float:right;
	650	+ margin-right:2px;
	651	+ img {
	652	+ width:20px;
	653	+ }
	654	+ }
648	655	ul {
649	656	margin-left:50px;
650	657	margin-bottom:5px;
...	...
...	...	@@ -83,7 +83,6 @@
83	83
84	84	.project_name {
85	85	float:left;
86		- width:360px;
87	86	margin:0;
88	87	margin-right:30px;
89	88	font-size:20px;
...	...
...	...	@@ -97,7 +97,6 @@
97	97	}
98	98	.project_name {
99	99	float:left;
100		- width:360px;
101	100	margin:0;
102	101	margin-right:30px;
103	102	font-size:20px;
...	...
	1	+- if event.action_name == "merged"
	2	+ .event_icon= image_tag "event_mr_merged.png"
1	3	= image_tag gravatar_icon(event.author_email), :class => "avatar"
2	4	%strong #{event.author_name}
3	5	%span.event_label= event.action_name
...	...
1	1	%div
	2	+ .event_icon= image_tag "event_push.png"
2	3	= image_tag gravatar_icon(event.author_email), :class => "avatar"
3	4	%strong #{event.author_name}
4	5	%span.event_label= event.push_action_name
	6	+ = event.ref_type
5	7	= link_to project_commits_path(event.project, :ref => event.ref_name) do
6	8	%strong= event.ref_name
7	9	at
...	...