MR index pollished

Dmitriy Zaporozhets
1 parent 2a705c4f
Showing 3 changed files with 19 additions and 5 deletions Show diff stats
app/assets/stylesheets/gitlab_bootstrap.scss
app/assets/stylesheets/sections/merge_requests.scss
app/views/merge_requests/_merge_request.html.haml
@@ -429,7 +429,7 @@ form {
  */
 .ui-box { 
   background:#F9F9F9;
-  margin-bottom: 40px;
+  margin-bottom: 25px;
   @include round-borders-all(4px);
   border-color: #CCC;
@@ -82,3 +82,15 @@
     }
   }
 }
+
+li.merge_request { 
+  padding:7px 10px;
+  img.avatar { 
+    width: 32px;
+    margin-top: 4px;
+  }
+  p { 
+    padding: 0px;
+    padding-bottom: 2px;
+  }
+}
@@ -15,12 +15,14 @@
         &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)
	@@ -429,7 +429,7 @@ form {		@@ -429,7 +429,7 @@ form {
429	*/	429	*/
430	.ui-box {	430	.ui-box {
431	background:#F9F9F9;	431	background:#F9F9F9;
432	- margin-bottom: 40px;	432	+ margin-bottom: 25px;
433	@include round-borders-all(4px);	433	@include round-borders-all(4px);
434	border-color: #CCC;	434	border-color: #CCC;
435		435
	@@ -82,3 +82,15 @@		@@ -82,3 +82,15 @@
82	}	82	}
83	}	83	}
84	}	84	}
		85	+
		86	+li.merge_request {
		87	+ padding:7px 10px;
		88	+ img.avatar {
		89	+ width: 32px;
		90	+ margin-top: 4px;
		91	+ }
		92	+ p {
		93	+ padding: 0px;
		94	+ padding-bottom: 2px;
		95	+ }
		96	+}