From e546348cccf7c780151af765b1c562983d148ff6 Mon Sep 17 00:00:00 2001 From: Stavy Date: Sat, 16 Dec 2017 16:03:29 +0200 Subject: [PATCH 1/3] Edit styling in conferences/_lodging --- app/views/conferences/_lodging.html.haml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/views/conferences/_lodging.html.haml b/app/views/conferences/_lodging.html.haml index 561e2421..70bea7f1 100644 --- a/app/views/conferences/_lodging.html.haml +++ b/app/views/conferences/_lodging.html.haml @@ -5,7 +5,7 @@ .container .row .col-md-12.text-center - %h2 + %h1 Where to stay - if @conference.venue in @@ -13,25 +13,25 @@ %p.lead We recommend these affordable lodging accommodations for your visit. - .row.row-centered{ style:"display: flex; flex-wrap: wrap" } + .row.row-centered{ style:'display: flex; flex-wrap: wrap' } - @conference.lodgings.each do |lodging| - .col-md-4.col-sm-4.col-centered.col-top{ style:"display:flex;" } + .col-md-4.col-sm-4.col-centered.col-top{ style:'display:flex;' } .thumbnail - if lodging.picture? - -if lodging.website_link.present? + - if lodging.website_link.present? = link_to(lodging.website_link, class: 'thumbnail') do = image_tag lodging.picture.large.url, class: 'img-responsive img-lodging' - else = image_tag lodging.picture.large.url, class: 'img-responsive img-lodging' - else %p.text-center - -if lodging.website_link.present? + - if lodging.website_link.present? = link_to(lodging.website_link, class: 'thumbnail') do %i.fa.fa-home.fa-5x - else %i.fa.fa-home.fa-5x .caption - %h3.text-center + %h2.text-center = lodging.name - -if lodging.description.present? + - if lodging.description.present? = markdown(lodging.description) From 39a65481411e9139e1409ce10c2e1cc83ae5a73f Mon Sep 17 00:00:00 2001 From: Stavy Date: Sat, 16 Dec 2017 16:30:10 +0200 Subject: [PATCH 2/3] Edit styling in models/user.rb --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index d062529a..fff13958 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -216,7 +216,7 @@ class User < ApplicationRecord end def proposals(conference) - events.where('program_id = ? AND (event_users.event_role=? OR event_users.event_role=?)', conference.program.id, 'submitter', 'speaker') + events.where('program_id = ? AND (event_users.event_role = ? OR event_users.event_role = ?)', conference.program.id, 'submitter', 'speaker') end def proposal_count(conference) From f0788c1e50fbeb809e165bf5a37c8c10e7adfd34 Mon Sep 17 00:00:00 2001 From: Stavy Date: Sat, 16 Dec 2017 16:35:49 +0200 Subject: [PATCH 3/3] Reset header size to previious values --- app/views/conferences/_lodging.html.haml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/conferences/_lodging.html.haml b/app/views/conferences/_lodging.html.haml index 70bea7f1..2ad18887 100644 --- a/app/views/conferences/_lodging.html.haml +++ b/app/views/conferences/_lodging.html.haml @@ -5,7 +5,7 @@ .container .row .col-md-12.text-center - %h1 + %h2 Where to stay - if @conference.venue in @@ -31,7 +31,7 @@ - else %i.fa.fa-home.fa-5x .caption - %h2.text-center + %h3.text-center = lodging.name - if lodging.description.present? = markdown(lodging.description)