diff --git a/app/assets/stylesheets/osem.css b/app/assets/stylesheets/osem.css index 5b578615..dcfd19c8 100644 --- a/app/assets/stylesheets/osem.css +++ b/app/assets/stylesheets/osem.css @@ -92,16 +92,20 @@ body { padding-bottom: 20px; } -#location{ +#venue-banner-disp{ background-repeat: no-repeat; background-position: center center; width: 100%; - min-height: 500px; background-size: cover; -webkit-background-size:cover; } -#location li{ +#venue-banner-disp li{ display: inline-block; margin-right: 2em; } + +.pad{ + padding-top: 35px; + padding-bottom: 35px; +} diff --git a/app/views/conference/_location.html.haml b/app/views/conference/_location.html.haml index ed5a7dfe..3b0c33cf 100644 --- a/app/views/conference/_location.html.haml +++ b/app/views/conference/_location.html.haml @@ -3,26 +3,27 @@ %a{ href: '#location' } Location -%div.container.text-center - .div.row.col-md-12 - - unless @conference.venue.name.blank? - %h1 - %strong #{ @conference.venue.name } - - unless @conference.venue.address.blank? - %h2 - %strong #{ @conference.venue.address } - - unless @conference.venue.description.blank? - %p - %strong #{ @conference.venue.description } - %ul +%div#venue-banner-disp + %div.container.text-center + .div.row.col-md-12 + - unless @conference.venue.name.blank? + %h1 + %strong #{ @conference.venue.name } - unless @conference.venue.address.blank? - %li - %b - = link_to 'View in Google Maps', "http://maps.google.com/maps?q=#{@conference.venue.address}", target: '_blank' - - unless @conference.venue.website.blank? - %li - %b - = link_to 'Visit Venue Website', @conference.venue.website, target: '_blank' + %h2 + %strong #{ @conference.venue.address } + - unless @conference.venue.description.blank? + %p + %strong #{ @conference.venue.description } + %ul + - unless @conference.venue.address.blank? + %li + %b + = link_to 'View in Google Maps', "http://maps.google.com/maps?q=#{@conference.venue.address}", target: '_blank' + - unless @conference.venue.website.blank? + %li + %b + = link_to 'Visit Venue Website', @conference.venue.website, target: '_blank' - unless @conference.venue.photo.blank? @@ -31,6 +32,7 @@ var photo = "#{@conference.venue.photo}"; if(photo) { - $('#location').css('background-image', 'url('+photo+')'); + $('#venue-banner-disp').css('min-height','500px'); + $('#venue-banner-disp').css('background-image', 'url('+photo+')'); } }); diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml index 330da61f..5245006c 100644 --- a/app/views/conference/show.html.haml +++ b/app/views/conference/show.html.haml @@ -3,20 +3,31 @@ - unless @conference.description.blank? %p= @conference.description -%div#program - = render 'program' -%div#registration + %section{ id: 'program' } + .pad + = render 'program' + +%section{ id: 'registration' } +.pad = render 'registration' + -unless @conference.call_for_papers.blank? - %div#callforpapers + %section{ id:'callforpapers' } + .pad = render 'call_for_papers' -unless @conference.venue.blank? - %div#location + %section{ id: 'location' } + .pad = render 'location' - if @conference.venue - unless @conference.venue.lodgings.empty? = render 'lodging' -%div#sponsors + +%section{ id: 'sponsors' } +.pad = render 'sponsor' -%div#social-media + +%section{ id: 'social-media' } +.pad = render 'social_media' +