Merge branch 'ui/commits_list' of /home/git/repositories/gitlab/gitlabhq

Dmitriy Zaporozhets
2 parents b349af20 9e9f0551
Showing 2 changed files with 24 additions and 7 deletions Show diff stats
app/assets/stylesheets/sections/commits.scss
app/views/projects/commits/_commits.html.haml
@@ -374,6 +374,15 @@
     min-width: 65px;
     font-family: $monospace_font;
   }
+
+  .row_title {
+    font-weight: bold;
+    color: #444;
+    &:hover {
+      color: #444;
+      text-decoration: underline;
+    }
+  }
 }
  
 .file-stats a {
@@ -496,3 +505,9 @@ li.commit {
     font-weight: bold;
   }
 }
+
+.commits-row {
+  padding-bottom: 10px;
+  margin-bottom: 10px;
+  border-bottom: 1px solid #DDD;
+}
 - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits|
-  .ui-box.small-box
-    .title
-      %i.icon-calendar
-      %span= day.stamp("28 Aug, 2010")
-      .pull-right
-        %small= pluralize(commits.count, 'commit')
-    %ul.well-list= render commits, project: @project
+  .row.commits-row
+    .span2
+      %h4
+        %i.icon-calendar
+        %span= day.stamp("28 Aug, 2010")
+      %p= pluralize(commits.count, 'commit')
+    .span10
+      %ul.well-list
+        = render commits, project: @project
...	...	@@ -374,6 +374,15 @@
374	374	min-width: 65px;
375	375	font-family: $monospace_font;
376	376	}
	377	+
	378	+ .row_title {
	379	+ font-weight: bold;
	380	+ color: #444;
	381	+ &:hover {
	382	+ color: #444;
	383	+ text-decoration: underline;
	384	+ }
	385	+ }
377	386	}
378	387
379	388	.file-stats a {
...	...	@@ -496,3 +505,9 @@ li.commit {
496	505	font-weight: bold;
497	506	}
498	507	}
	508	+
	509	+.commits-row {
	510	+ padding-bottom: 10px;
	511	+ margin-bottom: 10px;
	512	+ border-bottom: 1px solid #DDD;
	513	+}
...	...
1	1	- @commits.group_by { \|c\| c.committed_date.to_date }.sort.reverse.each do \|day, commits\|
2		- .ui-box.small-box
3		- .title
4		- %i.icon-calendar
5		- %span= day.stamp("28 Aug, 2010")
6		- .pull-right
7		- %small= pluralize(commits.count, 'commit')
8		- %ul.well-list= render commits, project: @project
	2	+ .row.commits-row
	3	+ .span2
	4	+ %h4
	5	+ %i.icon-calendar
	6	+ %span= day.stamp("28 Aug, 2010")
	7	+ %p= pluralize(commits.count, 'commit')
	8	+ .span10
	9	+ %ul.well-list
	10	+ = render commits, project: @project
...	...