From f320f3202aabd8bb06999e91511b48570adb108d Mon Sep 17 00:00:00 2001
From: Jimmy <jimmyxu1997@berkeley.edu>
Date: Wed, 7 Apr 2021 17:55:20 +0800
Subject: [PATCH] [feat]Display description and happening now in two columns;
 display happening now first in sm view

---
 app/views/conferences/_header.haml   |  8 ------
 app/views/conferences/show.html.haml | 38 +++++++++++++++++-----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/app/views/conferences/_header.haml b/app/views/conferences/_header.haml
index f40fe600..9a1316f6 100644
--- a/app/views/conferences/_header.haml
+++ b/app/views/conferences/_header.haml
@@ -26,11 +26,3 @@
                       - if venue.country != 'US'
                         &bull;
                         = 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
diff --git a/app/views/conferences/show.html.haml b/app/views/conferences/show.html.haml
index 52e8bc12..0ecad083 100644
--- a/app/views/conferences/show.html.haml
+++ b/app/views/conferences/show.html.haml
@@ -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