From 2f66500351b1d57aeda064f8a09ecc1e99e43561 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Mon, 23 Jun 2014 14:47:45 +0530 Subject: [PATCH 1/5] Fix sponsor images alignment based on count --- app/views/conference/_sponsor.html.haml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/views/conference/_sponsor.html.haml b/app/views/conference/_sponsor.html.haml index 2e957dd4..70af8019 100644 --- a/app/views/conference/_sponsor.html.haml +++ b/app/views/conference/_sponsor.html.haml @@ -12,12 +12,12 @@ - if !@conference.sponsorship_levels.blank? - @conference.sponsorship_levels.each do |l| - if !l.sponsors.blank? - %div.row + %div.row.text-center %h4 #{l.title} - l.sponsors.each_with_index do |r,index| - %div.col-md-4 + %div.text-center{ class: (l.sponsors.count.to_i <= 2 ? "col-md-#{12/l.sponsors.count.to_i}" : "col-md-4") } - if !r.logo.blank? - = link_to image_tag(r.logo(:large), class: 'img-responsive', alt: "#{r.name} Logo", title: "#{r.description}"), "http://#{r.website_url}" + = link_to image_tag(r.logo(:large), alt: "#{r.name} Logo", title: "#{r.description}"), "http://#{r.website_url}" - unless index == 0 - if index%2 == 0 %div.clearfix.visible-md.visible-lg From 351f0d891f2b6457fcdb2dabead95026e65df93a Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Mon, 23 Jun 2014 16:02:44 +0530 Subject: [PATCH 2/5] Fixed alignment of lodgings containers based on count --- app/views/conference/_lodging.html.haml | 27 +++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/app/views/conference/_lodging.html.haml b/app/views/conference/_lodging.html.haml index de09c222..f9b4296c 100644 --- a/app/views/conference/_lodging.html.haml +++ b/app/views/conference/_lodging.html.haml @@ -1,18 +1,19 @@ -%div.row.col-md-12.text-center +%div.container.text-center %h2 Lodgings -unless @conference.lodging_description.blank? %p.lead = @conference.lodging_description -%div.row - - @conference.venue.lodgings.each do |r| - %div.col-md-3.thumbnail - -unless r.photo.blank? - = image_tag r.photo(:large), class: 'img-responsive' - -unless r.name.blank? - %h4.text-center #{ r.name } - -unless r.description.blank? - %p.text-left #{ r.description } - - unless r.website_link.blank? - .text-center - = link_to 'Go to Website', r.website_link + %div.row.text-center + - @conference.venue.lodgings.each do |r| + %div{ class: (@conference.venue.lodgings.count.to_i <= 2 ? "col-md-#{12/@conference.venue.lodgings.count.to_i}" : "col-md-4") } + .div.thumbnail + -unless r.photo.blank? + = image_tag r.photo(:large), class: 'img-responsive' + -unless r.name.blank? + %h4.text-center #{ r.name } + -unless r.description.blank? + %p.text-left #{ r.description } + - unless r.website_link.blank? + .text-center + = link_to 'Go to Website', r.website_link From ee4208fa1e1f4852bca9a63c3882ccd5a86ad684 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Wed, 25 Jun 2014 15:24:07 +0530 Subject: [PATCH 3/5] Fix call for papers button alignment --- .../conference/_call_for_papers.html.haml | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/app/views/conference/_call_for_papers.html.haml b/app/views/conference/_call_for_papers.html.haml index 7c1e22c1..25ec6fb6 100644 --- a/app/views/conference/_call_for_papers.html.haml +++ b/app/views/conference/_call_for_papers.html.haml @@ -17,21 +17,23 @@ - if @conference.call_for_papers.end_date.to_time < Time.now %p Today is the last day. Hurry Up! - else - %div.row.col-md-6.col-md-offset-4 - %div.col-md-2 - %h2#days - %p Days - %div.col-md-2 - %h2#hours - %p Hours - %div.col-md-2 - %h2#minutes - %p Minutes - %div.col-md-2 - %h2#seconds - %p Seconds - %p - = link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank' + .row + .col-md-6.col-md-offset-4 + %div.col-md-2 + %h2#days + %p Days + %div.col-md-2 + %h2#hours + %p Hours + %div.col-md-2 + %h2#minutes + %p Minutes + %div.col-md-2 + %h2#seconds + %p Seconds + .row + %p + = link_to "Submit Your Proposals Today", conference_proposal_index_path(@conference.short_title), class: 'btn btn-info', target: '_blank' -else %h3 Deadline has ended From 1e9b416e2b08233ba36693d03f398f81b75b78ba Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Wed, 25 Jun 2014 15:37:32 +0530 Subject: [PATCH 4/5] Fix banner view --- app/views/conference/show.html.haml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/app/views/conference/show.html.haml b/app/views/conference/show.html.haml index a3b042ab..277b5218 100644 --- a/app/views/conference/show.html.haml +++ b/app/views/conference/show.html.haml @@ -5,16 +5,18 @@ %section{ id: 'splash-banner' } %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 + .row %h1 = @conference.title - if @conference.start_date && @conference.end_date - %h3 - = conference_date_string(@conference) + .row + %h3 + = conference_date_string(@conference) - unless @conference.description.blank? - .row-fluid.col-md-12.lead - %p= @conference.description + .row-fluid + .col-md-12.lead + %p= @conference.description - if @conference.include_program_in_splash? %section{ id: 'program' } From f6da596cc9311758bae763831a173b006834bafa Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Thu, 26 Jun 2014 20:19:08 +0530 Subject: [PATCH 5/5] Count down timer alignment --- app/views/conference/_call_for_papers.html.haml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/conference/_call_for_papers.html.haml b/app/views/conference/_call_for_papers.html.haml index 25ec6fb6..61f874ec 100644 --- a/app/views/conference/_call_for_papers.html.haml +++ b/app/views/conference/_call_for_papers.html.haml @@ -18,7 +18,7 @@ %p Today is the last day. Hurry Up! - else .row - .col-md-6.col-md-offset-4 + .col-md-8.col-md-offset-3 %div.col-md-2 %h2#days %p Days