From f29cee245d22a02194fb1c4626ab19b2f05b67f6 Mon Sep 17 00:00:00 2001 From: Stephanie Wilkinson Date: Fri, 29 Sep 2017 15:38:05 -0700 Subject: [PATCH] change location --- app/views/conferences/_schedule_splashpage.html.haml | 3 --- app/views/conferences/_venue.html.haml | 6 ++++-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/conferences/_schedule_splashpage.html.haml b/app/views/conferences/_schedule_splashpage.html.haml index 936b7e03..1f66530e 100644 --- a/app/views/conferences/_schedule_splashpage.html.haml +++ b/app/views/conferences/_schedule_splashpage.html.haml @@ -28,9 +28,6 @@ = link_to(conference_schedule_path(@conference.short_title), class: 'btn btn-default btn-lg') do Full Schedule - - %h3.text-center - Join us! %br - if @conference.program.events.highlights.any? .row diff --git a/app/views/conferences/_venue.html.haml b/app/views/conferences/_venue.html.haml index 62af90c7..7fb0a45b 100644 --- a/app/views/conferences/_venue.html.haml +++ b/app/views/conferences/_venue.html.haml @@ -23,11 +23,13 @@ = markdown(@conference.venue.description) .col-md-6 %h2 - = "#{@conference.venue.city} / #{@conference.venue.country_name}" + = "#{@conference.venue.name}" + %h3 + = "#{@conference.venue.city}" %address = @conference.venue.street %br - = "#{@conference.venue.postalcode}, #{@conference.venue.city}" + = "#{@conference.venue.city}, CA #{@conference.venue.postalcode}" %br = @conference.venue.country_name - if @conference.venue.website