Commit 1f81c0085e6680b00ff9a20c0dc35fd08ac232f3
Exists in
master
and in
4 other branches
Merge branch 'ui/commits_list' of /home/git/repositories/gitlab/gitlabhq
Showing
2 changed files
with
24 additions
and
7 deletions
Show diff stats
app/assets/stylesheets/sections/commits.scss
| @@ -374,6 +374,15 @@ | @@ -374,6 +374,15 @@ | ||
| 374 | min-width: 65px; | 374 | min-width: 65px; |
| 375 | font-family: $monospace_font; | 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 | .file-stats a { | 388 | .file-stats a { |
| @@ -496,3 +505,9 @@ li.commit { | @@ -496,3 +505,9 @@ li.commit { | ||
| 496 | font-weight: bold; | 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 | +} |
app/views/projects/commits/_commits.html.haml
| 1 | - @commits.group_by { |c| c.committed_date.to_date }.sort.reverse.each do |day, commits| | 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 |