diff --git a/app/assets/stylesheets/osem.css b/app/assets/stylesheets/osem.css index f3dac7d0..5adccac6 100644 --- a/app/assets/stylesheets/osem.css +++ b/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; diff --git a/app/views/conference/_location.html.haml b/app/views/conference/_location.html.haml index cadeb9fb..70325c81 100644 --- a/app/views/conference/_location.html.haml +++ b/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? diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml index 514b3e0c..a3b042ab 100644 --- a/app/views/conference/show.html.haml +++ b/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.container.text-center.banner-text - .row.col-md-12 - %h1 - = @conference.title - - if @conference.start_date && @conference.end_date - %h3 - = conference_date_string(@conference) + %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 + .row.col-md-12 + %h1 + = @conference.title + - if @conference.start_date && @conference.end_date + %h3 + = conference_date_string(@conference) - - unless @conference.description.blank? - .row-fluid.col-md-12.lead - %p= @conference.description + - unless @conference.description.blank? + .row-fluid.col-md-12.lead + %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 - = render 'registration' + .pad + = render 'registration' -unless @conference.call_for_papers.blank? - if @conference.call_for_papers.include_cfp_in_splash? %section{ id:'callforpapers' } - .pad - = render 'call_for_papers' + .pad + = render 'call_for_papers' -unless @conference.venue.blank? - if @conference.venue.include_venue_in_splash? %section{ id: 'location' } - .pad - = render 'location' - - unless @conference.venue.lodgings.empty? - - if @conference.venue.include_lodgings_in_splash? - = render 'lodging' + .pad + = render 'location' + - unless @conference.venue.lodgings.empty? + - if @conference.venue.include_lodgings_in_splash? + = render 'lodging' - if @conference.include_sponsors_in_splash? %section{ id: 'sponsors' } - .pad - = render 'sponsor' + .pad + = render 'sponsor' - if @conference.include_social_media_in_splash? %section{ id: 'social-media' } - .pad - = render 'social_media' + .pad + = render 'social_media'