summaryrefslogtreecommitdiff
path: root/app/views/events
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-26 23:26:41 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-05-26 23:26:41 +0300
commitc456231690c8fabeeefc844d46c9d5b0403df357 (patch)
treeddb6bdf17416379508816d3d6fe99496f8ae461f /app/views/events
parent7ad5fb53ac4e14b22684a0d4904ccf724fd4e082 (diff)
downloadgitlab-ce-c456231690c8fabeeefc844d46c9d5b0403df357.tar.gz
Use css truncation on dashboard
Diffstat (limited to 'app/views/events')
-rw-r--r--app/views/events/_event.html.haml2
-rw-r--r--app/views/events/_event_last_push.html.haml13
-rw-r--r--app/views/events/event/_push.html.haml2
3 files changed, 9 insertions, 8 deletions
diff --git a/app/views/events/_event.html.haml b/app/views/events/_event.html.haml
index 8cf26671e3b..61383315373 100644
--- a/app/views/events/_event.html.haml
+++ b/app/views/events/_event.html.haml
@@ -1,6 +1,6 @@
- if event.proper?
.event-item{class: "#{event.body? ? "event-block" : "event-inline" }"}
- %span.cgray.pull-right
+ .event-item-timestamp
#{time_ago_with_tooltip(event.created_at)}
= cache event do
diff --git a/app/views/events/_event_last_push.html.haml b/app/views/events/_event_last_push.html.haml
index 6db05a1a5a6..4c9a39bcc27 100644
--- a/app/views/events/_event_last_push.html.haml
+++ b/app/views/events/_event_last_push.html.haml
@@ -1,11 +1,12 @@
- if show_last_push_widget?(event)
.event-last-push
- %span You pushed to
- = link_to project_commits_path(event.project, event.ref_name) do
- %strong= truncate(event.ref_name, length: 28)
- at
- %strong= link_to_project event.project
- #{time_ago_with_tooltip(event.created_at)}
+ .event-last-push-text
+ %span You pushed to
+ = link_to project_commits_path(event.project, event.ref_name) do
+ %strong= event.ref_name
+ at
+ %strong= link_to_project event.project
+ #{time_ago_with_tooltip(event.created_at)}
.pull-right
= link_to new_mr_path_from_push_event(event), title: "New Merge Request", class: "btn btn-create btn-small" do
diff --git a/app/views/events/event/_push.html.haml b/app/views/events/event/_push.html.haml
index f181df23eb4..1bca64c7d50 100644
--- a/app/views/events/event/_push.html.haml
+++ b/app/views/events/event/_push.html.haml
@@ -5,7 +5,7 @@
%strong= event.ref_name
- else
= link_to project_commits_path(event.project, event.ref_name) do
- %strong= truncate(event.ref_name, length: 30)
+ %strong= event.ref_name
at
= link_to_project event.project