Commit 9bc829d3975d70b3a7639a965aa8fbd7ee1f047f
1 parent
2bc78739
Exists in
master
and in
4 other branches
Fix markdown for note events
Showing
2 changed files
with
10 additions
and
3 deletions
Show diff stats
app/assets/stylesheets/sections/events.scss
| @@ -40,7 +40,7 @@ | @@ -40,7 +40,7 @@ | ||
| 40 | } | 40 | } |
| 41 | } | 41 | } |
| 42 | .event-body { | 42 | .event-body { |
| 43 | - p { | 43 | + .commit p { |
| 44 | color: #555; | 44 | color: #555; |
| 45 | padding-top: 5px; | 45 | padding-top: 5px; |
| 46 | } | 46 | } |
| @@ -51,7 +51,14 @@ | @@ -51,7 +51,14 @@ | ||
| 51 | padding-top: 5px; | 51 | padding-top: 5px; |
| 52 | padding-left: 5px; | 52 | padding-left: 5px; |
| 53 | display: inline-block; | 53 | display: inline-block; |
| 54 | + color: #555; | ||
| 55 | + } | ||
| 56 | + .event-note-icon { | ||
| 54 | color: #777; | 57 | color: #777; |
| 58 | + float: left; | ||
| 59 | + font-size: 16px; | ||
| 60 | + line-height: 18px; | ||
| 61 | + margin: 5px; | ||
| 55 | } | 62 | } |
| 56 | } | 63 | } |
| 57 | .avatar { | 64 | .avatar { |
app/views/events/event/_note.html.haml
| @@ -19,6 +19,6 @@ | @@ -19,6 +19,6 @@ | ||
| 19 | = event.project_name | 19 | = event.project_name |
| 20 | 20 | ||
| 21 | .event-body | 21 | .event-body |
| 22 | + %i.icon-comment-alt.event-note-icon | ||
| 22 | %span.event-note | 23 | %span.event-note |
| 23 | - %i.icon-comment-alt | ||
| 24 | - = gfm truncate(event.target.note, length: 70) | 24 | + = markdown truncate(event.target.note, length: 70) |