Skip to content

Commit

Permalink
Styling tweaks and copy updates
Browse files Browse the repository at this point in the history
commit cbbf313
Merge: 2be9be0 2fa011d
Author: Andrew Cobby <[email protected]>
Date:   Wed Oct 10 19:59:59 2012 +1100

    Merge branch 'master' into jamie

commit 2be9be0
Author: Jamie Ferguson <[email protected]>
Date:   Wed Oct 10 18:46:38 2012 +1100

    Hover state for G+ logo

commit c17b2b8
Author: Jamie Ferguson <[email protected]>
Date:   Wed Oct 10 18:07:30 2012 +1100

    Changed date

commit 655b88a
Author: Jamie Ferguson <[email protected]>
Date:   Wed Oct 10 09:27:11 2012 +1100

    Spacing of budget allocator categores

commit 0c53e55
Merge: 16053ef 9f9b79e
Author: Andrew Cobby <[email protected]>
Date:   Tue Oct 9 23:28:21 2012 +1100

    Merge branch 'master' into jamie

commit 16053ef
Merge: 66ff145 a41c814
Author: Andrew Cobby <[email protected]>
Date:   Tue Oct 9 14:44:29 2012 +1100

    Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie

commit 66ff145
Merge: dd867a9 5cdafc2
Author: Andrew Cobby <[email protected]>
Date:   Tue Oct 9 14:44:17 2012 +1100

    Merge branch 'master' into jamie

commit a41c814
Author: Jamie Ferguson <[email protected]>
Date:   Tue Oct 9 11:32:59 2012 +1100

    Updated Priv Ed graphic

commit 5316656
Author: Jamie Ferguson <[email protected]>
Date:   Tue Oct 9 11:08:49 2012 +1100

    Text changes in about

commit dd867a9
Merge: e6b243b 9756973
Author: Andrew Cobby <[email protected]>
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 e6b243b
Merge: 86e5468 80dd935
Author: Andrew Cobby <[email protected]>
Date:   Tue Oct 9 09:26:16 2012 +1100

    Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie

commit 80dd935
Author: Jamie Ferguson <[email protected]>
Date:   Tue Oct 9 09:04:48 2012 +1100

    About tool text

commit 6f7e47d
Author: Jamie Ferguson <[email protected]>
Date:   Tue Oct 9 08:49:18 2012 +1100

    Safi's text fixes

commit 86e5468
Merge: 1be8075 a3544f7
Author: Andrew Cobby <[email protected]>
Date:   Mon Oct 8 17:48:03 2012 +1100

    Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie

commit 1be8075
Author: Andrew Cobby <[email protected]>
Date:   Mon Oct 8 17:46:19 2012 +1100

    Fix JavaScript loading again

commit a3544f7
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 17:12:23 2012 +1100

    Spelling error FIXEDDDD!!!!!

commit 7a4f1e9
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 16:58:34 2012 +1100

    Size of thumbs in related

commit 3f40be5
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 16:12:23 2012 +1100

    Edited summary

commit 4dd6a5d
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 16:11:57 2012 +1100

    Curly quotes

commit e555dce
Merge: 51fbc84 946747f
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 16:01:04 2012 +1100

    Merge branch 'jamie' of github.com:TheGlobalMail/YourFederalBudget2012 into jamie

commit 51fbc84
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 16:00:35 2012 +1100

    Summaries, more info

commit 946747f
Merge: cae75b2 326a494
Author: Andrew Cobby <[email protected]>
Date:   Mon Oct 8 15:40:14 2012 +1100

    Merge branch 'master' into jamie

commit cae75b2
Merge: fc246c2 118573a
Author: Andrew Cobby <[email protected]>
Date:   Mon Oct 8 15:27:02 2012 +1100

    Merge branch 'master' into jamie

commit fc246c2
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 13:27:14 2012 +1100

    Deleted tin-foil text

commit fa033a3
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 13:04:59 2012 +1100

    Tooltip copy

commit cc96c79
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 11:58:07 2012 +1100

    Removed full stops from graphic

commit e7d40af
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 11:13:33 2012 +1100

    Changed colour of flagged abuse text

commit 1456e88
Author: Jamie Ferguson <[email protected]>
Date:   Mon Oct 8 11:11:11 2012 +1100

    Adjusted line-height of header text
  • Loading branch information
Andrew Cobby committed Oct 10, 2012
1 parent 2fa011d commit f8c09f2
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 9 deletions.
8 changes: 4 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion templates/intro-modal.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<div class="left">
<h1>How would you spend your tax dollars?</h1>
<img class="author" src="/img/author-mikeseccome.png">
<h3 class="story-detail-byline"><em>By</em> <a href="/reporters/mike-seccombe/1/">Mike Seccombe</a><span class="date"><img src="/img/ico-date.png" width="15" height="15" style="padding-right: 8px; padding-bottom: 4px">September 8, 2012</span>
<h3 class="story-detail-byline"><em>By</em> <a href="/reporters/mike-seccombe/1/">Mike Seccombe</a><span class="date"><img src="/img/ico-date.png" width="15" height="15" style="padding-right: 8px; padding-bottom: 4px">October 11, 2012</span>

</h3>
</div>
Expand Down
Binary file added web/img/text-fade.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions web/less/budget-allocator.less
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -29,7 +29,7 @@
-moz-box-sizing: border-box;
box-sizing: border-box;
position: relative;
height: 48px;
height: 49px;

.top {
height: 54%;
Expand Down Expand Up @@ -372,7 +372,7 @@
}

.progress-bar {
margin-bottom: 4%;
margin-bottom: 6%;

&.budget-fully-allocated {
-webkit-box-shadow: 0 0 0 2px #ff6666;
Expand Down
2 changes: 1 addition & 1 deletion web/less/responsive.less
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
}

.category {
height: 56px;
height: 58px;

&.active:after {
bottom: 25px;
Expand Down
4 changes: 4 additions & 0 deletions web/less/tooltip.less
Original file line number Diff line number Diff line change
Expand Up @@ -127,6 +127,10 @@
a, img {
margin: 0 2px;
}
img:hover {
.opacity(70);
cursor: pointer;
}
}
}

Expand Down

0 comments on commit f8c09f2

Please sign in to comment.