diff --git a/public/images/screencast.gif b/public/images/screencast.gif deleted file mode 100644 index 115063b0f..000000000 Binary files a/public/images/screencast.gif and /dev/null differ diff --git a/t/web/country.rb b/t/web/country.rb index 0dee4cb8d..316b65c20 100644 --- a/t/web/country.rb +++ b/t/web/country.rb @@ -44,6 +44,15 @@ end end + describe 'when displaying democratic commons footer' do + let(:link) { subject.css('.demo-commons-promo') } + before { get '/iran/' } + + it 'should link to mySociety Democratic Commons page' do + link.css('a').last[:href].must_equal 'https://www.mysociety.org/democracy/democratic-commons/' + end + end + describe 'HTML validation' do it 'has no errors in the country page' do get '/estonia/' diff --git a/t/web/house.rb b/t/web/house.rb index 75b783c8b..559c956a2 100644 --- a/t/web/house.rb +++ b/t/web/house.rb @@ -21,6 +21,15 @@ end end + describe 'when displaying democratic commons footer' do + let(:link) { subject.css('.demo-commons-promo') } + before { get '/australia/representatives/' } + + it 'should link to mySociety Democratic Commons page' do + link.css('a').last[:href].must_equal 'https://www.mysociety.org/democracy/democratic-commons/' + end + end + describe 'HTML validation' do it 'has no errors in the house page' do last_response_must_be_valid diff --git a/views/country.erb b/views/country.erb index eb3022ee5..3e1498b75 100644 --- a/views/country.erb +++ b/views/country.erb @@ -41,19 +41,13 @@ -
+
-
-

Help us collect gender information for <%= @page.country.name %> by playing our fiendishly addictive online game, Gender Balance!

-

Swipe your way through politicians in a flash, and work your way up our leaderboard.

-

Play Gender Balance now

- - -
- Gender-Balance app preview -
-
+
+

Part of the Democratic Commons

+

A growing community of individuals and organisations working to make information on every politician in the world freely available to all, through Wikidata.

+

Help gather the data, use it for your own projects — or give us feedback

diff --git a/views/homepage.erb b/views/homepage.erb index c359f4173..fbb139010 100644 --- a/views/homepage.erb +++ b/views/homepage.erb @@ -14,17 +14,22 @@
-
+
-
+
-
-

Help us collect gender information for <%= @page.country.name %> by playing our fiendishly addictive online game, Gender Balance!

-

Swipe your way through politicians in a flash, and work your way up our leaderboard.

-

Play Gender Balance now

- - -
- Gender-Balance app preview -
-
+
+

Part of the Democratic Commons

+

A growing community of individuals and organisations working to make information on every politician in the world freely available to all, through Wikidata.

+

Help gather the data, use it for your own projects — or give us feedback

+ diff --git a/views/sass/_custom.scss b/views/sass/_custom.scss index bcc93f655..2973ac166 100644 --- a/views/sass/_custom.scss +++ b/views/sass/_custom.scss @@ -115,6 +115,15 @@ } } +.homepage__info-links { + .column-one-third { + margin-bottom: 2em; + @media (min-width: $large_screen) { + margin-bottom: 0; + } + } +} + .party-groupings__title { font-size: 0.875em; margin-bottom: 1.5em; @@ -167,55 +176,17 @@ } } -// My kingdom for a parent selector in CSS! -// Add some extra margin above the promo section because the screencast -// sticks out and it feels a bit tight against the previous section. -.page-section--gender-balance-promo { +.page-section--demo-commons-promo { @media (min-width: $medium_screen) { - margin-top: 2em; padding: 3em 0; } } -.gender-balance-promo { - @media (min-width: $medium_screen) { - position: relative; // positioning context for the demo gif - padding-left: 340px; // make space for the demo gif - max-width: 44em; // avoid silly long lines - margin: 0 auto; // centred when the window is wide - } - - p { - margin-bottom: 0; // avoid extra space after last paragraph - } - - p + p { - margin-top: 1em; - } -} - -.gender-balance-promo__demo { - display: block; // because it's actually an element - position: relative; - bottom: -2em; // counteract padding-bottom on .page-section - - @media (min-width: $medium_screen) { - position: absolute; - left: 0; - bottom: -3em; - } -} - -.screenshot-wrapper { - background: transparent url(/images/iphone.png) 0 0 no-repeat; - padding: 70px 24px 0 24px; - margin: 0 auto; - width: 280px; - - img { - width: 232px; - height: 330px; - vertical-align: bottom; +.demo-commons-promo { + //Bare-bones promo for now, there's room for a logo or graphics when they exist + max-width: 40em; // avoid silly long lines + a { + text-decoration: underline; } }