diff --git a/app/assets/stylesheets/osem-splash.css.scss b/app/assets/stylesheets/osem-splash.css.scss index ad7ff109..387dfc00 100644 --- a/app/assets/stylesheets/osem-splash.css.scss +++ b/app/assets/stylesheets/osem-splash.css.scss @@ -64,6 +64,9 @@ #venue { padding-top: 0px; padding-bottom: 0px; + #venue-pic { + margin-top: 20px; + } } #lodging { @@ -171,18 +174,3 @@ } } } - -/* Venue icon styles */ -.icon-container { - position: relative; - height: 60%; - .icon-inner { - position:absolute; - top:50%; - left: 50%; - transform:translate(-50%,-50%); - .fa-university { - font-size: 10em; - } - } -} diff --git a/app/views/admin/venues/_form.html.haml b/app/views/admin/venues/_form.html.haml index 5b93cac0..7dd08a2c 100644 --- a/app/views/admin/venues/_form.html.haml +++ b/app/views/admin/venues/_form.html.haml @@ -16,9 +16,6 @@ = f.inputs :name, :website = f.input :description, input_html: { rows: 5, cols: 20, data: { provide: 'markdown-editable' } }, hint: markdown_hint = f.inputs :street, :postalcode, :city, :country, :latitude, :longitude - - if @venue.picture? - = image_tag @venue.picture.thumb.url - = f.input :picture = f.action :submit, as: :button, button_html: { class: 'btn btn-primary' } #commercials-content.tab-pane diff --git a/app/views/conference/_venue.html.haml b/app/views/conference/_venue.html.haml index f457272c..4fd97b90 100644 --- a/app/views/conference/_venue.html.haml +++ b/app/views/conference/_venue.html.haml @@ -6,32 +6,25 @@ -else .container .row - - if @conference.venue.commercial.present? and @conference.venue.commercial.persisted? - .col-md-5 - .thumbnail + .col-md-6 + .thumbnail#venue-pic + - if @conference.venue.commercial.present? and @conference.venue.commercial.persisted? .flexvideo{ id: "resource-content-#{@conference.venue.commercial.id}"} = render partial: 'shared/media_item', locals: { commercial: @conference.venue.commercial } - - elsif @conference.venue.picture.present? - .col-md-5 - .thumbnail + - elsif @conference.venue.picture? = image_tag @conference.venue.picture.url, alt: @conference.venue.name, class:"img-responsive" - - else - .col-md-5 - .thumbnail.icon-container - .icon-inner - = fa_icon "university" - .col-md-6 - %h2.text-center - = "#{@conference.venue.city} / #{@conference.venue.country_name}" - .col-md-6 - .thumbnail + - else + %p.text-center + %span.fa.fa-university.fa-5x .caption + %h3.text-center + = @conference.venue.name - unless @conference.venue.description.blank? = markdown(@conference.venue.description) .col-md-6 + %h2 + = "#{@conference.venue.city} / #{@conference.venue.country_name}" %address - %h1 - = @conference.venue.name = @conference.venue.street %br = "#{@conference.venue.postalcode}, #{@conference.venue.city}"