Conservancy/website
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix endifs and change formatting

Browse source 
formatting removes additional raised on original bar
also increase size of larger portion of match
This commit is contained in:
Daniel Pono Takamori 2026-01-14 11:49:59 -08:00
parent 8719403b81
commit 76ef5019af
2 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
View file

@ -13,7 +13,7 @@
Thanks to so many donors, we met <em>our largest match donation ever of <strong>$211,939</strong>.
A generous anonymous donor has provided <em>another $40,000</em> of matching funds.
<a href="https://sfconservancy.org/sustainer/">Give now to help us</a> reach this stretch goal!<br/>
OLD_ENDIF
{% endif %}
{% if sitefundgoal1.days_remaining == 0 %}
For the <strongly>only</strong> the next {{ sitefundgoal1.hours_remaining }} hour{{ sitefundgoal1.hours_remaining|pluralize }}, the
{% elif sitefundgoal1.days_remaining == 1 %}
@ -22,9 +22,9 @@
For only {{ sitefundgoal1.days_remaining }} more days, the
{% else %}
Until FIXME_DATE, the
OLD_ENDIF
{% endif %}
next <b>${{ sitefundgoal1.match_remaining|floatformat:0|intcomma }}</b> of <a href="/sustainer/">support we receive</a> will be matched!
OLD_ENDIF
{% endif %}
{% else %} {# ELSE LEVEL 2.0 when (sitefundgoal1.days_remaining < 0) #}
Thanks to all our donors who participated in our
historic donation match challenge! Thanks to you, we raised our goal of <b>$503,878</b> to support software freedom:
@ -33,10 +33,7 @@
<div id="siteprogressbar" class="flex items-stretch w-100">
{% if sitefundgoal1.match_remaining <= 0 %}
<div class="progress matched ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal1.fundraiser_so_far_amount }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1">${{ sitefundgoal1.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div>
<div class="progress exceeded pv1 b flex items-center" style="flex-basis: {{ sitefundgoal1.match_exceeded_by }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded ph1">${{sitefundgoal1.match_exceeded_by|floatformat:0|intcomma }} additional<br> raised!<br></span>
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1 done">${{ sitefundgoal1.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div>
{% else %}
<div class="progress ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal1.fundraiser_so_far_amount }}px">
@ -50,10 +47,7 @@
<div id="siteprogressbar" class="flex items-stretch w-100">
{% if sitefundgoal0.match_remaining <= 0 %}
<div class="progress matched ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1">${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div>
<div class="progress exceeded pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_exceeded_by }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded ph1">${{sitefundgoal0.match_exceeded_by|floatformat:0|intcomma }} additional<br> raised!<br></span>
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1 done">${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div>
{% else %}
<div class="progress ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
@ -61,13 +55,14 @@
</div>
<div class="final-goal pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_remaining }}px">
<span id="site-fundraiser-final-goal" class="goalText tc w-100 ph1">${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }} to go!</span>
{% endif %}
</div>
OLD_ENDIF
</div>
</a>
</div>
</div>
{% endif %}
{% else %} {# ELSE LEVEL 1 when (sitefundgoal0.match_remaining > 0) #}
<div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">
<div class="mw8 center ph2 ph4-ns">
@ -85,24 +80,21 @@
Help us reach our goal of <b>$503,878</b> this season to keep SFC going. For only {{ sitefundgoal0.days_remaining }} more days, the
{% else %}
Help us reach our goal of <b>$503,878</b> this season to keep SFC going. Until January 15, the
OLD_ENDIF
{% endif %}
next <b>${{ sitefundgoal0.match_remaining|floatformat:0|intcomma }}</b> of <a href="/sustainer/">support we receive</a> will be matched!
OLD_ENDIF
{% endif %}
{% else %}
Thanks to all our donors who participated in our
historic donation match challenge! Thanks to you, <a href="https://sfconservancy.org/blog/2025/jan/16/end-of-year-2024-fundraiser-a-massive-success/">we
raised more than $480k to support software freedom</a>:
OLD_ENDIF
{% endif %}
</div>
<a href="/sustainer/" style="text-decoration: none !important">
<div id="siteprogressbar" class="flex items-stretch w-100">
{% if sitefundgoal0.match_remaining <= 0 %}
<div class="progress matched ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1">${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div>
<div class="progress exceeded pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.match_exceeded_by }}px">
<span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded ph1">${{sitefundgoal0.match_exceeded_by|floatformat:0|intcomma }} additional<br> raised!<br></span>
<span id="site-fundraiser-match-count" class="soFarText tc w-100 ph1 done">${{ sitefundgoal0.fundraiser_goal_amount|floatformat:0|intcomma }} fully matched!</span>
</div>
{% else %}
<div class="progress ph1 pv1 b flex items-center" style="flex-basis: {{ sitefundgoal0.fundraiser_so_far_amount }}px">

3
conservancy/static/css/conservancy.css
View file

@ -1168,6 +1168,9 @@ body > header {
#siteprogressbar .soFarText {
color: white;
}
#siteprogressbar .done {
font-size: 130%;
}
#siteprogressbar .exceeded {
color: var(--khaki-green);
}