[feat]Add brief version of event partial; fix style

This commit is contained in:
Jimmy 2021-04-09 22:17:33 +08:00
parent 02300ee8f2
commit 6c96328f46
3 changed files with 37 additions and 36 deletions

View file

@ -1,3 +1,16 @@
= content_for :happening_now do
#happening-now
= render 'happening_now', conference: conference,
events_schedules: events_schedules, pagy: pagy,
events_schedules_length: events_schedules_length,
events_schedules_limit: events_schedules_limit
= content_for :about do
#about
.row
%h2.text-left{ style: 'margin-bottom:30px' } About the Conference
= markdown(conference.description, false)
%section#about-and-happening-now
.container
.row
@ -5,29 +18,15 @@
- if conference.splashpage.include_happening_now?
- if conference.description.present?
.col-md-6.col-md-push-6.col-lg-4.col-lg-push-8
#happening-now
= render 'happening_now', conference: conference,
events_schedules: events_schedules, pagy: pagy,
events_schedules_length: events_schedules_length,
events_schedules_limit: events_schedules_limit
= yield :happening_now
- else
.col-md-12
#happening-now
= render 'happening_now', conference: conference,
events_schedules: events_schedules, pagy: pagy,
events_schedules_length: events_schedules_length,
events_schedules_limit: events_schedules_limit
= yield :happening_now
- if conference.description.present?
- if conference.splashpage.include_happening_now?
.col-md-6.col-md-pull-6.col-lg-8.col-lg-pull-4
#about
.row
%h2.text-left{ style: 'margin-bottom:30px' } About the Conference
= markdown(conference.description, false)
= yield :about
- else
.col-md-12
#about
.row
%h2.text-left{ style: 'margin-bottom:30px' } About the Conference
= markdown(conference.description, false)
= yield :about
.trapezoid

View file

@ -3,7 +3,7 @@
.row
%h2.text-center{ style: 'margin-bottom:30px' } Happening Now
- events_schedules.each do |event_schedule|
= render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event
= render 'schedules/event', conference: conference, event_schedule: event_schedule, event: event_schedule.event, is_brief: true
- if events_schedules_length > events_schedules_limit
.container{ style: 'width:100%; text-align:center' }
!= pagy_bootstrap_nav_js(pagy)