OSDN Git Service

MR index pollished
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 17 Jul 2012 05:17:16 +0000 (08:17 +0300)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 17 Jul 2012 05:17:16 +0000 (08:17 +0300)
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/sections/merge_requests.scss
app/views/merge_requests/_merge_request.html.haml

index 8197590..119180c 100644 (file)
@@ -429,7 +429,7 @@ form {
  */
 .ui-box { 
   background:#F9F9F9;
-  margin-bottom: 40px;
+  margin-bottom: 25px;
   @include round-borders-all(4px);
   border-color: #CCC;
 
index ad49623..34f43ac 100644 (file)
     }
   }
 }
+
+li.merge_request { 
+  padding:7px 10px;
+  img.avatar { 
+    width: 32px;
+    margin-top: 4px;
+  }
+  p { 
+    padding: 0px;
+    padding-bottom: 2px;
+  }
+}
index d9634a4..b9a005e 100644 (file)
         &rarr;
         = merge_request.target_branch
   = image_tag gravatar_icon(merge_request.author_email), :class => "avatar"
+
+  = link_to project_merge_request_path(merge_request.project, merge_request) do
+    %p.row_title= truncate(merge_request.title, :length => 80)
+
   %span.update-author
-    %strong= merge_request.author_name
-    authored
+    %small.cdark= "##{merge_request.id}"
+    authored by #{merge_request.author_name}
     = time_ago_in_words(merge_request.created_at)
     ago
     - if merge_request.upvotes > 0
       %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)