diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-06 15:53:35 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2013-04-06 15:53:35 +0300 |
| commit | f4ae433d9017c0b6e9f3ffcb68dc0426ca7b721d (patch) | |
| tree | 0e41dad69e22a232a0bc0a2b4d19c7eaed1029ad /app | |
| parent | 5b06c9a73bda4e8e9c0dce11ebc2fe866dc85a7f (diff) | |
| download | gitlab-ce-f4ae433d9017c0b6e9f3ffcb68dc0426ca7b721d.tar.gz | |
Increase event title font size on dashboard activity feed
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/stylesheets/sections/events.scss | 1 | ||||
| -rw-r--r-- | app/models/event.rb | 2 | ||||
| -rw-r--r-- | app/views/events/event/_common.html.haml | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 94e1d0b609c..d365dd7c12b 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -35,6 +35,7 @@ .event-title { color: #333; font-weight: bold; + font-size: 14px; .author_name { color: #333; } diff --git a/app/models/event.rb b/app/models/event.rb index 7488b99f434..97f96ac8f9e 100644 --- a/app/models/event.rb +++ b/app/models/event.rb @@ -134,7 +134,7 @@ class Event < ActiveRecord::Base if closed? "closed" elsif merged? - "merged" + "accepted" elsif joined? 'joined' elsif left? diff --git a/app/views/events/event/_common.html.haml b/app/views/events/event/_common.html.haml index 53cbe1c94ce..05d3832c7f9 100644 --- a/app/views/events/event/_common.html.haml +++ b/app/views/events/event/_common.html.haml @@ -2,11 +2,15 @@ %span.author_name= link_to_author event %span.event_label{class: event.action_name}= event_action_name(event) - if event.target - %strong= link_to_gfm truncate(event.target_title), [event.project, event.target] + %strong= link_to "##{event.target_id}", [event.project, event.target] - else - %strong= gfm truncate(event.target_title) + %strong= gfm event.target_title at - if event.project = link_to_project event.project - else = event.project_name +.event-body + .event-note + - if event.target.respond_to?(:title) + = event.target.title |