Issues & MR legend

app/views/merge_requests/_merge_request.html.haml

@@ -1,4 +1,6 @@
-%li.wll
+%li.wll{ :class => mr_css_classes(merge_request) }
+  .list_legend
+    .icon
   .right
     .left
       - if merge_request.notes.any?
@@ -14,6 +16,6 @@
     = time_ago_in_words(merge_request.created_at)
     ago
     - if merge_request.upvotes > 0
-      %span.label.success= "+#{merge_request.upvotes}"
+      %span.badge.badge-success= "+#{merge_request.upvotes}"
   = link_to project_merge_request_path(merge_request.project, merge_request) do
     %p.row_title= truncate(merge_request.title, :length => 80)

app/views/merge_requests/index.html.haml

@@ -6,6 +6,20 @@
 
 %br
 
+.mrs_legend
+  .list_legend
+    .icon.today
+    .text Today
+
+  .list_legend
+    .icon.merged
+    .text Merged
+
+  .list_legend
+    .icon.closed
+    .text Closed
+.clearfix
+
 .ui-box
   .title
     %ul.nav.nav-pills
@@ -26,7 +40,7 @@
     = render @merge_requests
     - if @merge_requests.blank?
       %li
-        %p.padded Nothing to show here
+        %h4.nothing_here_message Nothing to show here
     - if @merge_requests.present?
       %li.bottom
         .row