Skip to content

Commit

Permalink
Added print styles, misc code tidying
Browse files Browse the repository at this point in the history
  • Loading branch information
craigcook committed Nov 10, 2012
1 parent 334bd91 commit 6baca27
Show file tree
Hide file tree
Showing 5 changed files with 277 additions and 54 deletions.
5 changes: 3 additions & 2 deletions apps/foundation/templates/foundation/annualreport/2011.html
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@


{% block extrahead %} {% block extrahead %}
{{ css('annual_2011') }} {{ css('annual_2011') }}
<link rel="stylesheet" media="print" href="{{ MEDIA_URL }}css/foundation/annual2011print.css">
{% endblock %} {% endblock %}


{% block js %} {% block js %}
Expand Down Expand Up @@ -897,8 +898,8 @@ <h2 class="section-title">{{ _('Sustainability and Partnerships') }}</h2>
<section class="sus-links"> <section class="sus-links">
<ul> <ul>
<li><a class="sus-faq" href="{{ url('foundation.annualreport.2011faq') }}">{{ _('FAQ') }}</a></li> <li><a class="sus-faq" href="{{ url('foundation.annualreport.2011faq') }}">{{ _('FAQ') }}</a></li>
<li><a class="sus-fin" href="#">{{ _('2011 Audited Financial Statement') }} <small>{{ _('Download PDF') }}</small></a></li> <li><a class="sus-fin" href="#" hreflang="en-US">{{ _('2011 Audited Financial Statement') }} <small>{{ _('Download PDF') }}</small></a></li>
<li><a class="sus-990" href="#">{{ _('2011 Form 990') }} <small>{{ _('Download PDF') }}</small></a></li> <li><a class="sus-990" href="#" hreflang="en-US">{{ _('2011 Form 990') }} <small>{{ _('Download PDF') }}</small></a></li>
</ul> </ul>
</section> </section>


Expand Down
91 changes: 46 additions & 45 deletions media/css/foundation/annual2011.less
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ body.noscroll {
text-shadow: 0 1px 1px rgba(0,0,0,.95); text-shadow: 0 1px 1px rgba(0,0,0,.95);
video { video {
width: 640px; width: 640px;
max-width: 90%; max-width: 96%;
height: auto; height: auto;
display: block; display: block;
margin: 90px auto 20px; margin: 90px auto 20px;
Expand Down Expand Up @@ -662,7 +662,7 @@ body.noscroll {
margin-top: .15em; margin-top: .15em;
} }
} }
h4, h4,
h5 { h5 {
font-style: normal; font-style: normal;
text-shadow: none; text-shadow: none;
Expand Down Expand Up @@ -798,16 +798,16 @@ body.noscroll {
#page-nav.fixed { #page-nav.fixed {
width: 740px; width: 740px;
} }

#main-content { #main-content {
width: 700px; width: 700px;
} }

.left, .left,
.right { .right {
width: 340px; width: 340px;
} }

.mob-fxandroid { .mob-fxandroid {
h4 { h4 {
font-size: 32px; font-size: 32px;
Expand All @@ -823,40 +823,40 @@ body.noscroll {
margin: 0; margin: 0;
width: auto; width: auto;
} }

.mob-standards .pull { .mob-standards .pull {
font-size: 26px; font-size: 26px;
min-height: 160px; min-height: 160px;
} }

.act-donottrack img { .act-donottrack img {
padding: 130px 37.5px 96px; padding: 130px 37.5px 96px;
} }

.act-flicks img { .act-flicks img {
padding: 40px 70px 19px; padding: 40px 70px 19px;
} }

.com-intro .pull { .com-intro .pull {
height: 340px; height: 340px;
h3 { h3 {
font-size: 38px; font-size: 38px;
} }
} }

.com-mozcamps { .com-mozcamps {
.left img { .left img {
width: 233px; width: 233px;
} }
.left .video-play img { .left .video-play img {
width: 340px; width: 340px;
} }
} }

.jcarousel-clip { .jcarousel-clip {
width: 660px; width: 660px;
} }

#story-slider, #story-slider,
#story-slider-clone { #story-slider-clone {
.vcard { .vcard {
Expand All @@ -874,23 +874,23 @@ body.noscroll {
#wrapper { #wrapper {
width: 320px; width: 320px;
} }

#main-content { #main-content {
width: 280px; width: 280px;
} }

#masthead h1 { #masthead h1 {
font-size: 32px; font-size: 32px;
letter-spacing: -1px; letter-spacing: -1px;
} }

#page-nav { #page-nav {
padding: 20px 12px 25px 0; padding: 20px 12px 25px 0;
li { li {
float: none; float: none;
} }
} }

#page-nav.fixed { #page-nav.fixed {
width: 308px; width: 308px;
top: -13em; top: -13em;
Expand All @@ -899,36 +899,36 @@ body.noscroll {
float: none; float: none;
} }
} }

#page-nav.fixed ul:after { #page-nav.fixed ul:after {
position: absolute; position: absolute;
top: 100%; top: 100%;
left: 50%; left: 50%;
border: solid transparent; border: solid transparent;
content: " "; content: " ";
height: 0; height: 0;
width: 0; width: 0;
border-top-color: @mozred; border-top-color: @mozred;
border-width: 10px; border-width: 10px;
margin-left: -10px; margin-left: -10px;
} }

#page-nav.fixed.welcome ul:after { border-top-color: @mozred; } #page-nav.fixed.welcome ul:after { border-top-color: @mozred; }
#page-nav.fixed.mobilized ul:after { border-top-color: @blue; } #page-nav.fixed.mobilized ul:after { border-top-color: @blue; }
#page-nav.fixed.action ul:after { border-top-color: #000; } #page-nav.fixed.action ul:after { border-top-color: #000; }
#page-nav.fixed.community ul:after { border-top-color: @orange; } #page-nav.fixed.community ul:after { border-top-color: @orange; }
#page-nav.fixed.sustainability ul:after { border-top-color: @red; } #page-nav.fixed.sustainability ul:after { border-top-color: @red; }

.left, .left,
.right { .right {
float: none; float: none;
width: 280px; width: 280px;
} }

.overlay-wrap .read { .overlay-wrap .read {
display: none; display: none;
} }

.js .overlay { .js .overlay {
position: static; position: static;
left: auto; left: auto;
Expand All @@ -946,7 +946,7 @@ body.noscroll {
color: @linkBlueHover; color: @linkBlueHover;
} }
} }

#welcome .video { #welcome .video {
margin-left: 0; margin-left: 0;
} }
Expand All @@ -961,20 +961,20 @@ body.noscroll {
#topic-firefox img { #topic-firefox img {
margin-top: -86px; margin-top: -86px;
} }

#topic-firefoxos img { #topic-firefoxos img {
margin-top: -100px; margin-top: -100px;
} }

#topic-webmaker img { #topic-webmaker img {
margin-top: -90px; margin-top: -90px;
} }
} }

.mob-fxandroid h4 { .mob-fxandroid h4 {
display: none; display: none;
} }

.mob-firefoxos .pull, .mob-firefoxos .pull,
.mob-fxdesktop .pull, .mob-fxdesktop .pull,
.mob-webmaker .pull, .mob-webmaker .pull,
Expand All @@ -997,15 +997,15 @@ body.noscroll {
background: transparent none; background: transparent none;
} }
} }

#action .act-sopa .overlay h4 { #action .act-sopa .overlay h4 {
color: inherit; color: inherit;
} }

.act-flicks img { .act-flicks img {
padding: 20px 40px; padding: 20px 40px;
} }

.com-intro .pull { .com-intro .pull {
height: auto; height: auto;
width: auto; width: auto;
Expand All @@ -1022,11 +1022,11 @@ body.noscroll {
display: none; display: none;
} }
} }

.js .com-reps .overlay { .js .com-reps .overlay {
margin-top: 20px; margin-top: 20px;
} }

.com-reps .rep { .com-reps .rep {
float: none; float: none;
margin: 20px 0; margin: 20px 0;
Expand Down Expand Up @@ -1057,12 +1057,12 @@ body.noscroll {
} }
a.sus-fin:before, a.sus-fin:before,
a.sus-990:before { a.sus-990:before {
display: none; display: none;
} }
} }

#story-slider { #story-slider {
margin-top: 20px; margin-top: 20px;
.vcard { .vcard {
width: 280px; width: 280px;
min-height: 158px; min-height: 158px;
Expand All @@ -1080,11 +1080,11 @@ body.noscroll {
#wrapper { #wrapper {
width: 420px; width: 420px;
} }

#main-content { #main-content {
width: 380px; width: 380px;
} }

.left, .left,
.right { .right {
float: none; float: none;
Expand All @@ -1099,7 +1099,7 @@ body.noscroll {
.mob-topics { .mob-topics {
font-size: 18px; font-size: 18px;
} }

.mob-firefoxos .pull, .mob-firefoxos .pull,
.mob-fxdesktop .pull, .mob-fxdesktop .pull,
.mob-webmaker .pull, .mob-webmaker .pull,
Expand All @@ -1112,9 +1112,9 @@ body.noscroll {
.act-flicks img { .act-flicks img {
padding: 20px 90px; padding: 20px 90px;
} }

#story-slider { #story-slider {
margin-top: 20px; margin-top: 20px;
.vcard { .vcard {
width: 170px; width: 170px;
float: left; float: left;
Expand All @@ -1124,4 +1124,5 @@ body.noscroll {
} }
} }


} }

Loading

0 comments on commit 6baca27

Please sign in to comment.