From 3eb0ecf994b248077369a20c2a528d6478fe9ea0 Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Thu, 26 Jun 2014 22:25:15 +0530 Subject: [PATCH] Enhance text on location banner Fix failing test and css fixes --- app/assets/stylesheets/splash.css.scss | 12 +++++++++++- app/views/conference/_location.html.haml | 2 +- spec/views/conference/show.html.haml_spec.rb | 2 +- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/splash.css.scss b/app/assets/stylesheets/splash.css.scss index 391491d2..5388e8a8 100644 --- a/app/assets/stylesheets/splash.css.scss +++ b/app/assets/stylesheets/splash.css.scss @@ -129,8 +129,18 @@ a:after { i{ color: #4a4a4a; } - i:hover{ color: #16a085; } } + +#location{ + + h1,h2,p{ + color: #fff; + } + h1,h2,li,p{ + text-shadow: 0px 0px 2px rgba(0, 0, 0, 0.6); + font-weight: 400; + } +} diff --git a/app/views/conference/_location.html.haml b/app/views/conference/_location.html.haml index d7698e31..e6d4c62f 100644 --- a/app/views/conference/_location.html.haml +++ b/app/views/conference/_location.html.haml @@ -14,7 +14,7 @@ %strong #{ @conference.venue.address } - unless @conference.venue.description.blank? %p - %strong #{ @conference.venue.description } + = @conference.venue.description %ul.location-links - unless @conference.venue.address.blank? %li diff --git a/spec/views/conference/show.html.haml_spec.rb b/spec/views/conference/show.html.haml_spec.rb index 717a1223..9ea5e023 100644 --- a/spec/views/conference/show.html.haml_spec.rb +++ b/spec/views/conference/show.html.haml_spec.rb @@ -33,7 +33,7 @@ describe 'conference/show.html.haml' do it 'renders banner component' do expect(view.content_for(:splash)).to include("#{@conference.description}") - expect(view.content_for(:splash)).to include("#{@conference.title}") + expect(view.content_for(:splash)).to include("#{@conference.short_title}") end it 'renders program partial' do