Download as
Browse Code »

Commit f4ae433d9017c0b6e9f3ffcb68dc0426ca7b721d

Authored by Dmitriy Zaporozhets
1 parent 5b06c9a7
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Increase event title font size on dashboard activity feed

Showing 3 changed files with 8 additions and 3 deletions   Show diff stats
app/assets/stylesheets/sections/events.scss
  Diff comments   View file @f4ae433
@@ -35,6 +35,7 @@ @@ -35,6 +35,7 @@
35 .event-title { 35 .event-title {
36 color: #333; 36 color: #333;
37 font-weight: bold; 37 font-weight: bold;
  38 + font-size: 14px;
38 .author_name { 39 .author_name {
39 color: #333; 40 color: #333;
40 } 41 }
app/models/event.rb
  Diff comments   View file @f4ae433
@@ -134,7 +134,7 @@ class Event < ActiveRecord::Base @@ -134,7 +134,7 @@ class Event < ActiveRecord::Base
134 if closed? 134 if closed?
135 "closed" 135 "closed"
136 elsif merged? 136 elsif merged?
137 - "merged" 137 + "accepted"
138 elsif joined? 138 elsif joined?
139 'joined' 139 'joined'
140 elsif left? 140 elsif left?
app/views/events/event/_common.html.haml
  Diff comments   View file @f4ae433
@@ -2,11 +2,15 @@ @@ -2,11 +2,15 @@
2 %span.author_name= link_to_author event 2 %span.author_name= link_to_author event
3 %span.event_label{class: event.action_name}= event_action_name(event) 3 %span.event_label{class: event.action_name}= event_action_name(event)
4 - if event.target 4 - if event.target
5 - %strong= link_to_gfm truncate(event.target_title), [event.project, event.target] 5 + %strong= link_to "##{event.target_id}", [event.project, event.target]
6 - else 6 - else
7 - %strong= gfm truncate(event.target_title) 7 + %strong= gfm event.target_title
8 at 8 at
9 - if event.project 9 - if event.project
10 = link_to_project event.project 10 = link_to_project event.project
11 - else 11 - else
12 = event.project_name 12 = event.project_name
  13 +.event-body
  14 + .event-note
  15 + - if event.target.respond_to?(:title)
  16 + = event.target.title