[feat]Display description and happening now in two columns; display happening now first in sm view

This commit is contained in:
Jimmy 2021-04-07 17:55:20 +08:00
parent 9e2c78e236
commit 7d51ff9eb4
2 changed files with 23 additions and 23 deletions

View file

@ -26,11 +26,3 @@
- if venue.country != 'US'
•
= venue.country_name
- unless conference.description.blank?
%section#about
.container
.row
.col-md-8.col-md-offset-2
= markdown(conference.description, escape_html=false)
.trapezoid

View file

@ -41,23 +41,31 @@
- if @conference.code_of_conduct.present?
= render 'code_of_conduct', organization: @conference.organization
-# header/description
-# header
= render 'header', conference: @conference, venue: @conference.venue
-# happening now events
%section#happening-now
- if @conference.splashpage.include_happening_now
- if @events_schedules.any?
.row
.col-md-12
%h2.text-center Happening Now
.container{ style: "padding: 20;" }
- for event_schedule in @events_schedules
= render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event
- else
.row
.col-md-12
%h3.text-center There are no events happening now.
-# description / happening now
%section#about-and-happening-now
.container
.row
-# happening now events are displayed second in md or lg view
.col-md-4.col-md-push-8
#happening-now
- if @conference.splashpage.include_happening_now
- if @events_schedules.any?
.row
%h2.text-center Happening Now
- for event_schedule in @events_schedules
= render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event
- else
.row
%h3.text-center There are no events happening now.
- if @conference.description.present?
.col-md-8.col-md-pull-4
#about
.row
= markdown(@conference.description, escape_html=false)
.trapezoid
-# calls for content, or program
- if @conference.splashpage.include_cfp