From fa8219e0a753e642a6f1dbdfc010d01ae8a949ee Mon Sep 17 00:00:00 2001
From: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Date: Thu, 22 Mar 2012 22:57:04 +0200
Subject: [PATCH] better MR list, dashboard  pollished

---
 app/views/dashboard/index.html.haml              |  8 ++++----
 .../merge_requests/_merge_request.html.haml      | 16 +++++++++-------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/views/dashboard/index.html.haml b/app/views/dashboard/index.html.haml
index 39b05d0c6ea..289e8d0a989 100644
--- a/app/views/dashboard/index.html.haml
+++ b/app/views/dashboard/index.html.haml
@@ -20,8 +20,8 @@
   .row
     .dashboard_block
       .row
-        .span4
-          %div.prettyprint.ipadded
+        .span4.right
+          %div.borders.ipadded
             %h1
               = pluralize current_user.projects.count, "project", "projects"
             - if current_user.can_create_project?
@@ -34,9 +34,9 @@
                   %br
                   = link_to new_project_path, :class => "btn" do 
                     New Project » 
-        .span10.right= render "dashboard/projects_feed", :projects => @active_projects
+        .span10.left= render "dashboard/projects_feed", :projects => @active_projects
       - if @last_push
-        .ui-box.padded.prepend-top-20
+        .padded.prepend-top-20
           %h5
             %small Latest push was to the #{@last_push.branch_name} branch of #{@last_push.project.name}:
           %ul.unstyled= render @last_push
diff --git a/app/views/merge_requests/_merge_request.html.haml b/app/views/merge_requests/_merge_request.html.haml
index 9f556c06561..54300fae0d5 100644
--- a/app/views/merge_requests/_merge_request.html.haml
+++ b/app/views/merge_requests/_merge_request.html.haml
@@ -1,17 +1,19 @@
 %li.wll
+  .right
+    .left
+      - if merge_request.notes.any?
+        %span.btn.small.disabled.padded= pluralize merge_request.notes.count, 'note'
+      %span.btn.small.disabled.padded
+        = merge_request.source_branch
+        &rarr;
+        = merge_request.target_branch
   = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
   %span.update-author
     %strong= merge_request.author_name
     authored
     = time_ago_in_words(merge_request.created_at)
     ago
-    - if merge_request.notes.any?
-      %span.pretty_label= pluralize merge_request.notes.count, 'note'
     - if merge_request.upvotes > 0
       %span.label.success= "+#{merge_request.upvotes}"
-  .right
-    %span.label= merge_request.source_branch
-    &rarr;
-    %span.label= merge_request.target_branch
   = link_to project_merge_request_path(merge_request.project, merge_request) do
-    %p.row_title= truncate(merge_request.title, :length => 100)
+    %p.row_title= truncate(merge_request.title, :length => 80)
-- 
GitLab