From f8c09f2c37a6b8d77a671e2c45048f331bb2285c Mon Sep 17 00:00:00 2001 From: Andrew Cobby Date: Wed, 10 Oct 2012 20:01:23 +1100 Subject: [PATCH] Styling tweaks and copy updates commit cbbf313a289eb424f6488c2f7d560f73183c0b7d Merge: 2be9be0 2fa011d Author: Andrew Cobby Date: Wed Oct 10 19:59:59 2012 +1100 Merge branch 'master' into jamie commit 2be9be00c4f82c6bdd11c302cfe60d570e93b34b Author: Jamie Ferguson Date: Wed Oct 10 18:46:38 2012 +1100 Hover state for G+ logo commit c17b2b8c43ee5d4eb4a8883e53bc45554029cce2 Author: Jamie Ferguson Date: Wed Oct 10 18:07:30 2012 +1100 Changed date commit 655b88a63b9afd64649bfa20b379312857884399 Author: Jamie Ferguson Date: Wed Oct 10 09:27:11 2012 +1100 Spacing of budget allocator categores commit 0c53e55a63faebcc387ed90a96cba0ac742133e0 Merge: 16053ef 9f9b79e Author: Andrew Cobby Date: Tue Oct 9 23:28:21 2012 +1100 Merge branch 'master' into jamie commit 16053ef6f59a38ca5b268830c56d9e046616ca4f Merge: 66ff145 a41c814 Author: Andrew Cobby Date: Tue Oct 9 14:44:29 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 66ff145aeee15e7e8395f74004020b343944954b Merge: dd867a9 5cdafc2 Author: Andrew Cobby Date: Tue Oct 9 14:44:17 2012 +1100 Merge branch 'master' into jamie commit a41c814d530cb89f8909d16155089bb9fd21e7d9 Author: Jamie Ferguson Date: Tue Oct 9 11:32:59 2012 +1100 Updated Priv Ed graphic commit 5316656044adb6e243f84cfc912533cc408b8ba5 Author: Jamie Ferguson Date: Tue Oct 9 11:08:49 2012 +1100 Text changes in about commit dd867a98b667ed772cd0d8be2315704084da5965 Merge: e6b243b 9756973 Author: Andrew Cobby Date: Tue Oct 9 09:29:57 2012 +1100 Merge branch 'master' into jamie Conflicts: templates/javascript.twig templates/more-info/defence.twig templates/more-info/immigration.twig templates/more-info/industryAssistance.twig commit e6b243bfa8d68b65aa83024f7d71328c6e01e304 Merge: 86e5468 80dd935 Author: Andrew Cobby Date: Tue Oct 9 09:26:16 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 80dd9355f6099f83cb196bf9e6cab6bec220d2a6 Author: Jamie Ferguson Date: Tue Oct 9 09:04:48 2012 +1100 About tool text commit 6f7e47d78702602a8b0f5e139b1a4ef29e879e18 Author: Jamie Ferguson Date: Tue Oct 9 08:49:18 2012 +1100 Safi's text fixes commit 86e546838897994d6b7e3961a99ff1a5b51a4a70 Merge: 1be8075 a3544f7 Author: Andrew Cobby Date: Mon Oct 8 17:48:03 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 1be8075c161c5c459477b9c751dc800111758e90 Author: Andrew Cobby Date: Mon Oct 8 17:46:19 2012 +1100 Fix JavaScript loading again commit a3544f763634bb402db18506f30c83768ddf653e Author: Jamie Ferguson Date: Mon Oct 8 17:12:23 2012 +1100 Spelling error FIXEDDDD!!!!! commit 7a4f1e90006b0bc51466ce4dd77a267bcfcec11d Author: Jamie Ferguson Date: Mon Oct 8 16:58:34 2012 +1100 Size of thumbs in related commit 3f40be5330da26c1572228e38a97b1e73db10dab Author: Jamie Ferguson Date: Mon Oct 8 16:12:23 2012 +1100 Edited summary commit 4dd6a5dcedef0311ee272d39e6f4187f0ade74d0 Author: Jamie Ferguson Date: Mon Oct 8 16:11:57 2012 +1100 Curly quotes commit e555dced9c45f59b53000a283a22de7b5e0f1c90 Merge: 51fbc84 946747f Author: Jamie Ferguson Date: Mon Oct 8 16:01:04 2012 +1100 Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie commit 51fbc8451f4ca9eaaf66e411bb2ecdacd05a274a Author: Jamie Ferguson Date: Mon Oct 8 16:00:35 2012 +1100 Summaries, more info commit 946747f3d955f15fd407e6e8929e40e3898abb6a Merge: cae75b2 326a494 Author: Andrew Cobby Date: Mon Oct 8 15:40:14 2012 +1100 Merge branch 'master' into jamie commit cae75b246f0720d272e68eeceb41dbdd0b996508 Merge: fc246c2 118573a Author: Andrew Cobby Date: Mon Oct 8 15:27:02 2012 +1100 Merge branch 'master' into jamie commit fc246c25c5f17db23b2e25f48610dbebd34bf3c1 Author: Jamie Ferguson Date: Mon Oct 8 13:27:14 2012 +1100 Deleted tin-foil text commit fa033a3e98d5bb965adc7d3bfe4d02f925d082e1 Author: Jamie Ferguson Date: Mon Oct 8 13:04:59 2012 +1100 Tooltip copy commit cc96c799da1e9e74a8d8184fab7426198906ab59 Author: Jamie Ferguson Date: Mon Oct 8 11:58:07 2012 +1100 Removed full stops from graphic commit e7d40af6da3af8979e50d8f5eb6a1b7eb2eaa302 Author: Jamie Ferguson Date: Mon Oct 8 11:13:33 2012 +1100 Changed colour of flagged abuse text commit 1456e88d945fcd40828286712c32f9b394b76b97 Author: Jamie Ferguson Date: Mon Oct 8 11:11:11 2012 +1100 Adjusted line-height of header text --- composer.lock | 8 ++++---- templates/intro-modal.twig | 2 +- web/img/text-fade.png | Bin 0 -> 994 bytes web/less/budget-allocator.less | 6 +++--- web/less/responsive.less | 2 +- web/less/tooltip.less | 4 ++++ 6 files changed, 13 insertions(+), 9 deletions(-) create mode 100644 web/img/text-fade.png diff --git a/composer.lock b/composer.lock index 2905ce0..a3dacd4 100644 --- a/composer.lock +++ b/composer.lock @@ -56,8 +56,8 @@ { "package": "symfony/http-foundation", "version": "2.1.x-dev", - "source-reference": "5f18e1d5b901b320d05230aa91934e7d81f64bb4", - "commit-date": "1349553277" + "source-reference": "5803400b1ddc7115cf9c960f83e0b50029ce768e", + "commit-date": "1349773267" }, { "package": "symfony/http-kernel", @@ -68,8 +68,8 @@ { "package": "symfony/routing", "version": "2.1.x-dev", - "source-reference": "0443e2f9a10f49cac77128eb7f11d055fcf4db9d", - "commit-date": "1349363877" + "source-reference": "893590dbf4e60786d21cc475695a8c3aa5529f7d", + "commit-date": "1349714394" }, { "package": "twig/twig", diff --git a/templates/intro-modal.twig b/templates/intro-modal.twig index 70d2a50..1939a25 100644 --- a/templates/intro-modal.twig +++ b/templates/intro-modal.twig @@ -3,7 +3,7 @@

How would you spend your tax dollars?

-

By Mike SeccombeSeptember 8, 2012 +

By Mike SeccombeOctober 11, 2012

diff --git a/web/img/text-fade.png b/web/img/text-fade.png new file mode 100644 index 0000000000000000000000000000000000000000..6ad8c7b479bc394e47936fcfec51bb454beac340 GIT binary patch literal 994 zcmaJ=&ui0A9FMGyQ8!^H=T6Ve!xWn|SsU%6*-V?(6_zpDqCKdXC2wu$k{4gzY_^;8 zAfkBK#eYJk2M@v!=fQ)ZOb}rRg2x>M&niw|y0-IR4N2a6Up}AD_vgE}Fn?(zJ|5>d zZlpA;m)SZQeM5un|6u>Q%a)V0P@@&RL|Z07oMz)i1WK-1M`dK%t2f`EEXNI;cB(a6 zGv=U$UBQenLg@O8&2ib8&^N6nqF@o#9Z%)IZN21yW2^j?w2?IYJZd~*q@&`fHj0KR#1c9_Lm9UbM1QbP( zQfWnz&H*_o$zqbdNtD7o|)l z6KTkDf*}&Ysz=Q*;RO?21sw$zaeV4v4@8RQB3_{?&muiY!S#ExUeGBME0`FXz96bB9L zgM38+lZI(IUSv4aW*7!6c>y&&3zc-0XBvXz*icTT^z;R}kjxZwl2nj2NzUbpnwH8G z3k6M|>T-2#t+>deU9Nq|E%xO`!{GYNvyO;!3)w}2UC>S%I{jnG_toog?f$XoeYqkF zMvPkfSF5`wHb2p}H@NK38-3)lc_(bJ$tV=rrKpy4tr~v%x~s*v!7!)Yzx?a>-4FZx zsk!Z+PdDyNk4k5Ee(XFxe)Z$+C+nY&c^9|sFGpf?gV&F4oruMrz1|#qzcD#9w0CWI hcYJT4^6KsP*cg}1#vZ+UG4L?Db)~|*zL~qR{s*NOI+_3g literal 0 HcmV?d00001 diff --git a/web/less/budget-allocator.less b/web/less/budget-allocator.less index 5c22969..c6c204f 100644 --- a/web/less/budget-allocator.less +++ b/web/less/budget-allocator.less @@ -2,7 +2,7 @@ width: 90%; .categories { - margin-bottom: 10px; + margin-bottom: 4%; background: url(../img/lhc_fade.png) center top no-repeat; background-size: 100%; padding: 12px 0 0; @@ -29,7 +29,7 @@ -moz-box-sizing: border-box; box-sizing: border-box; position: relative; - height: 48px; + height: 49px; .top { height: 54%; @@ -372,7 +372,7 @@ } .progress-bar { - margin-bottom: 4%; + margin-bottom: 6%; &.budget-fully-allocated { -webkit-box-shadow: 0 0 0 2px #ff6666; diff --git a/web/less/responsive.less b/web/less/responsive.less index a22b761..904b677 100644 --- a/web/less/responsive.less +++ b/web/less/responsive.less @@ -57,7 +57,7 @@ } .category { - height: 56px; + height: 58px; &.active:after { bottom: 25px; diff --git a/web/less/tooltip.less b/web/less/tooltip.less index d318912..16ba209 100644 --- a/web/less/tooltip.less +++ b/web/less/tooltip.less @@ -127,6 +127,10 @@ a, img { margin: 0 2px; } + img:hover { + .opacity(70); + cursor: pointer; + } } }