diff --git a/app/views/conferences/_about_and_happening_now.haml b/app/views/conferences/_about_and_happening_now.haml index 92bd7a6f..82bf4ee3 100644 --- a/app/views/conferences/_about_and_happening_now.haml +++ b/app/views/conferences/_about_and_happening_now.haml @@ -18,7 +18,7 @@ -# happening now events are displayed second in md or lg view - if conference.splashpage.include_happening_now? && conference.splashpage.include_program? - if conference.description.present? - .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8 + .col-md-6.col-md-push-6.col-lg-4.col-lg-push-8{ style: 'margin-top: 60px'} = yield :happening_now - else .col-md-12 diff --git a/app/views/conferences/_happening_now.haml b/app/views/conferences/_happening_now.haml index 4e4c62ae..ccf0181f 100644 --- a/app/views/conferences/_happening_now.haml +++ b/app/views/conferences/_happening_now.haml @@ -1,10 +1,10 @@ - if events_schedules.present? && events_schedules.any? .row - %h2.text-center{ style: 'margin-bottom:30px' } + %h3.text-left{ style: 'margin-bottom:30px; padding-left:20px' } - if is_happening_next - Happening Next + Events Happening Next - else - Happening Now + Events Happening Now - events_schedules.each do |event_schedule| = render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true - if events_schedules_length > events_schedules_limit