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

app/views/conferences/_header.haml

@@ -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

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
+  -# description / happening now
-  %section#happening-now
+  %section#about-and-happening-now
-    - if @conference.splashpage.include_happening_now
+    .container
-      - if @events_schedules.any?
+      .row
-        .row
+        -# happening now events are displayed second in md or lg view
-          .col-md-12
+        .col-md-4.col-md-push-8
-            %h2.text-center Happening Now
+          #happening-now
-        .container{ style: "padding: 20;" }
+            - if @conference.splashpage.include_happening_now
-          - for event_schedule in @events_schedules
+              - if @events_schedules.any?
-            = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event
+                .row
-      - else
+                  %h2.text-center Happening Now
-        .row
+                - for event_schedule in @events_schedules
-          .col-md-12
+                  = render 'schedules/event', conference: @conference, event_schedule: event_schedule, event: event_schedule.event
-            %h3.text-center There are no events happening now.
+              - 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