From 494cd02b38eb2bfbeeb69dec0688a7a1e7ccf50f Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Tue, 17 Jul 2012 08:21:16 +0300
Subject: [PATCH] Colored labels for events on dashboard

---
 app/assets/stylesheets/gitlab_bootstrap.scss    | 17 ++++++++++++++---
 app/views/events/_event_issue.html.haml         |  4 ++--
 app/views/events/_event_merge_request.html.haml |  4 ++--
 app/views/events/_event_push.html.haml          |  2 +-
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index 119180c5..9feb2b81 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -303,9 +303,20 @@ table.no-borders {
 }
 
 .event_label { 
-  background: #FCEEC1;
-  padding: 2px 2px 0;
-  font-family: monospace;
+  @extend .label;
+  background-color: #999;
+
+  &.pushed { 
+    background-color: #3A87AD;
+  }
+
+  &.opened { 
+    background-color: #468847;
+  }
+
+  &.closed { 
+    background-color: #B94A48;
+  }
 }
 
 img.avatar { 
diff --git a/app/views/events/_event_issue.html.haml b/app/views/events/_event_issue.html.haml
index 13fb20cd..4293be82 100644
--- a/app/views/events/_event_issue.html.haml
+++ b/app/views/events/_event_issue.html.haml
@@ -1,7 +1,7 @@
 = image_tag gravatar_icon(event.author_email), :class => "avatar"
 %strong #{event.author_name}
-%span.event_label= event.action_name
-&nbsp;issue
+%span.event_label{:class => event.action_name}= event.action_name
+issue
 = link_to project_issue_path(event.project, event.issue) do
   %strong= truncate event.issue_title
 at
diff --git a/app/views/events/_event_merge_request.html.haml b/app/views/events/_event_merge_request.html.haml
index e59a74b9..774921a7 100644
--- a/app/views/events/_event_merge_request.html.haml
+++ b/app/views/events/_event_merge_request.html.haml
@@ -2,8 +2,8 @@
   .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
-&nbsp;merge request
+%span.event_label{:class => event.action_name}= event.action_name
+merge request
 = link_to project_merge_request_path(event.project, event.merge_request) do
   %strong= truncate event.merge_request_title
 at
diff --git a/app/views/events/_event_push.html.haml b/app/views/events/_event_push.html.haml
index 3aadd226..59d8962b 100644
--- a/app/views/events/_event_push.html.haml
+++ b/app/views/events/_event_push.html.haml
@@ -2,7 +2,7 @@
   .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
+  %span.event_label.pushed= event.push_action_name
   = event.ref_type
   = link_to project_commits_path(event.project, :ref => event.ref_name) do
     %strong= event.ref_name