Fix styling and layouts in splash view

app/assets/stylesheets/osem.css

@@ -99,20 +99,25 @@ body {
  background-size: cover;
  -webkit-background-size:cover;
 }
-.banner-disp.with-location-background{
+
+#location .with-background {
     min-height: 500px;
 }
-.banner-disp.with-splash-banner{
+
+#splash-banner .with-background{
     min-height: 700px;
 }
+
 .location-links li{
   display: inline-block;
   margin-right: 2em;
 }
+
 .banner-text{
     padding-top: 10%;
     color: #fff;
 }
+
 .pad{
     padding-top: 35px;
     padding-bottom: 35px;

app/views/conference/_location.html.haml

@@ -3,7 +3,7 @@
     %a{ href: '#location' } Location
 
 
-%div.banner-disp{ style: ("background-image: url(#{@conference.venue.photo})" unless @conference.venue.photo.blank?), class:('with-location-background' unless @conference.venue.photo.blank?) }
+%div.banner-disp{ style: ("background-image: url(#{@conference.venue.photo})" unless @conference.venue.photo.blank?), class:('with-background' unless @conference.venue.photo.blank?) }
   %div.container.text-center
     .div.row.col-md-12
       - unless @conference.venue.name.blank?

app/views/conference/show.html.haml

@@ -3,18 +3,18 @@
 = content_for :splash do
   - if @conference.include_banner_in_splash?
     %section{ id: 'splash-banner' }
-    %div.banner-disp{ style: ("background-image: url(#{@conference.banner_photo})" unless @conference.banner_photo.blank?), class:('with-splash-banner' unless @conference.banner_photo.blank?) }
+      %div.banner-disp{ style: ("background-image: url(#{@conference.banner_photo})" unless @conference.banner_photo.blank?), class:('with-background' unless @conference.banner_photo.blank?) }
-      %div.container.text-center.banner-text
+        %div.container.text-center.banner-text
-        .row.col-md-12
+          .row.col-md-12
-          %h1
+            %h1
-            = @conference.title
+              = @conference.title
-        - if @conference.start_date && @conference.end_date
+          - if @conference.start_date && @conference.end_date
-          %h3
+            %h3
-            = conference_date_string(@conference)
+              = conference_date_string(@conference)
 
-        - unless @conference.description.blank?
+          - unless @conference.description.blank?
-          .row-fluid.col-md-12.lead
+            .row-fluid.col-md-12.lead
-            %p= @conference.description
+              %p= @conference.description
 
   - if @conference.include_program_in_splash?
     %section{ id: 'program' }
@@ -23,32 +23,32 @@
 
   - if @conference.include_registrations_in_splash?
     %section{ id: 'registration' }
-    .pad
+      .pad
-      = render 'registration'
+        = render 'registration'
 
 
   -unless @conference.call_for_papers.blank?
     - if @conference.call_for_papers.include_cfp_in_splash?
       %section{ id:'callforpapers' }
-      .pad
+        .pad
-        = render 'call_for_papers'
+          = render 'call_for_papers'
 
   -unless @conference.venue.blank?
     - if @conference.venue.include_venue_in_splash?
       %section{ id: 'location' }
-      .pad
+        .pad
-        = render 'location'
+          = render 'location'
-    - unless @conference.venue.lodgings.empty?
+      - unless @conference.venue.lodgings.empty?
-      - if @conference.venue.include_lodgings_in_splash?
+        - if @conference.venue.include_lodgings_in_splash?
-        = render 'lodging'
+          = render 'lodging'
 
   - if @conference.include_sponsors_in_splash?
     %section{ id: 'sponsors' }
-    .pad
+      .pad
-      = render 'sponsor'
+        = render 'sponsor'
 
   - if @conference.include_social_media_in_splash?
     %section{ id: 'social-media' }
-    .pad
+      .pad
-      = render 'social_media'
+        = render 'social_media'