From 7fa007d6211d3abae3b76dc08b8772cfe9a78bf4 Mon Sep 17 00:00:00 2001 From: Astradeni Date: Fri, 5 Jan 2018 02:00:24 +0200 Subject: [PATCH] resolving conflict in conferences/_tickets Added in css .word_break and applied it in conferences/_tickets --- app/assets/stylesheets/osem.scss | 8 ++++++-- app/views/conferences/_tickets.haml | 5 +++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/app/assets/stylesheets/osem.scss b/app/assets/stylesheets/osem.scss index 7d0d0519..04da1a37 100644 --- a/app/assets/stylesheets/osem.scss +++ b/app/assets/stylesheets/osem.scss @@ -110,7 +110,7 @@ p.comment-body { .g-recaptcha { @include clearfix; padding-bottom: 12px; - + div { float: right; } @@ -120,4 +120,8 @@ p.comment-body { #openid-btn-grp{ display: flex; justify-content: center; -} \ No newline at end of file +} + +.word_break { + word-wrap: break-word; +} diff --git a/app/views/conferences/_tickets.haml b/app/views/conferences/_tickets.haml index 0a927593..5f0da517 100644 --- a/app/views/conferences/_tickets.haml +++ b/app/views/conferences/_tickets.haml @@ -16,9 +16,10 @@ = link_to(conference_tickets_path(conference.short_title), class: 'thumbnail') do .caption - %h3.text-center + %h3.text-center.word_break = ticket.title - = markdown(ticket.description) + .word_break + = markdown(ticket.description) %button.btn-block.btn.btn-lg.btn-success %i.fa.fa-ticket.fa-fw = humanized_money_with_symbol(ticket.price)