diff --git a/app/assets/stylesheets/sections/events.scss b/app/assets/stylesheets/sections/events.scss index 5ea739c..9b049ae 100644 --- a/app/assets/stylesheets/sections/events.scss +++ b/app/assets/stylesheets/sections/events.scss @@ -68,12 +68,10 @@ margin: 0 20px; } - .note-file-attach { - .note-image-attach { - margin-top: 4px; - margin-left: 0px; - max-width: 200px; - } + .note-image-attach { + margin-top: 4px; + margin-left: 0px; + max-width: 200px; } } .event-note-icon { diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index b93b150..8433e72 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -121,4 +121,8 @@ module EventsHelper end end end + + def event_note(text) + sanitize(markdown(truncate(text, length: 150)), tags: %w(a img b pre p)) + end end diff --git a/app/views/events/event/_note.html.haml b/app/views/events/event/_note.html.haml index 8384bbe..db5f3eb 100644 --- a/app/views/events/event/_note.html.haml +++ b/app/views/events/event/_note.html.haml @@ -10,7 +10,7 @@ .event-note .md %i.icon-comment-alt.event-note-icon - = sanitize(markdown(truncate(event.target.note, length: 150)), tags: %w(a img b pre p)) + = event_note(event.target.note) - note = event.target - if note.attachment.url - if note.attachment.image? -- libgit2 0.21.2