Commit b8425cf173841eb2f7ba95141f364241a81a52a8
1 parent
78af4683
Exists in
master
and in
4 other branches
Last push widget improved
Showing
2 changed files
with
7 additions
and
6 deletions
Show diff stats
app/assets/stylesheets/common.scss
@@ -604,7 +604,11 @@ li.note { | @@ -604,7 +604,11 @@ li.note { | ||
604 | border-style: solid; | 604 | border-style: solid; |
605 | border-width: 1px; | 605 | border-width: 1px; |
606 | @include border-radius(4px); | 606 | @include border-radius(4px); |
607 | - min-height:42px; | 607 | + min-height:22px; |
608 | + | ||
609 | + .avatar { | ||
610 | + width:24px; | ||
611 | + } | ||
608 | } | 612 | } |
609 | 613 | ||
610 | .supp_diff_link, | 614 | .supp_diff_link, |
@@ -695,4 +699,4 @@ li.note { | @@ -695,4 +699,4 @@ li.note { | ||
695 | border:1px solid #B8B; | 699 | border:1px solid #B8B; |
696 | } | 700 | } |
697 | } | 701 | } |
698 | -} | ||
699 | \ No newline at end of file | 702 | \ No newline at end of file |
703 | +} |
app/views/events/_event_last_push.html.haml
@@ -5,12 +5,9 @@ | @@ -5,12 +5,9 @@ | ||
5 | %span Your pushed to | 5 | %span Your pushed to |
6 | = event.ref_type | 6 | = event.ref_type |
7 | = link_to project_commits_path(event.project, :ref => event.ref_name) do | 7 | = link_to project_commits_path(event.project, :ref => event.ref_name) do |
8 | - %strong= event.ref_name | 8 | + %strong= truncate(event.ref_name, :length => 28) |
9 | at | 9 | at |
10 | %strong= link_to event.project.name, event.project | 10 | %strong= link_to event.project.name, event.project |
11 | - %span.cgray | ||
12 | - = time_ago_in_words(event.created_at) | ||
13 | - ago. | ||
14 | 11 | ||
15 | = link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn very_small primary" do | 12 | = link_to new_mr_path_from_push_event(event), :title => "New Merge Request", :class => "btn very_small primary" do |
16 | Create Merge Request | 13 | Create Merge Request |