Changeset - 7a49bf08d681
[Not reviewed]
0 2 0
Daniel Takamori (pono) - 3 years ago 2022-01-04 22:34:28
pono@sfconservancy.org
separate divs and add css for exceeded
2 files changed with 11 insertions and 2 deletions:
0 comments (0 inline, 0 general)
www/conservancy/static/css/conservancy.css
Show inline comments
...
 
@@ -257,114 +257,122 @@ body > header {
 
#menu-icon:active, #search-icon:active {
 
  transform: scale(1.1);
 
}
 
#navbar-outer { min-height: .5rem; }
 
#navbar.mobile {
 
  display: block;
 
  max-width: 32rem;
 
}
 
#navbar.mobile.search { display: block; }
 
#navbar.mobile li {
 
  display: block;
 
}
 
#navbar.mobile ul {
 
  padding-left: .5rem;
 
  padding-right: .5rem;
 
  display: block !important;
 
  position: relative !important;
 
  top: auto !important;
 
  left: 0 !important;
 
  right: auto !important;
 
  text-align: left !important;
 
}
 
#navbar.mobile > ul > li {
 
  padding-top: .5rem;
 
  padding-bottom: .5rem;
 
}
 
#navbar.mobile > ul > li {
 
  border-bottom: 1px solid rgba(255, 255, 255, 0.2);
 
}
 
#navbar.mobile li ul {
 
  margin-left: .5rem;
 
}
 

	
 
.fundraiser-top-text {
 
  background: #F0FFB8;
 
  margin-top: -.5rem;
 
}
 
.fundraiser-top-text p {
 
  font-size: 110%;
 
  font-style: italic;
 
  text-align: center;
 
}
 
#siteprogressbar .goalText {
 
  color: #557733;
 
}
 
#siteprogressbar .soFarText {
 
  color: white;
 
}
 
#siteprogressbar .exceeded {
 
  color: var(--khaki-green);
 
}
 
#siteprogressbar .progress {
 
  background: linear-gradient(var(--khaki-green), #84a377, var(--khaki-green));
 
  padding-left: 0.5rem;
 
  padding-right: 0.5rem;
 
  border-top-left-radius: 16px;
 
  border-bottom-left-radius: 16px;
 
  border: 1px solid #3f4439;
 
}
 
#siteprogressbar .final-goal {
 
  border-top-right-radius: 16px;
 
  border-bottom-right-radius: 16px;
 
  border: 1px solid #9bac88;
 
  border-left: none;
 
}
 
#siteprogressbar .progress.matched {
 
  border-top-right-radius: 16px;
 
  border-bottom-right-radius: 16px;
 
}
 
#siteprogressbar .progress.exceeded {
 
  border-top-right-radius: 16px;
 
  border-bottom-right-radius: 16px;
 
  background: linear-gradient(#84a377, var(--washed-green), #84a377);
 
}
 
#siteprogressbar {
 
  background: linear-gradient(var(--washed-green), white, var(--washed-green));
 
  box-shadow: 1px 1px 1px rgba(0,0,0,0.2);
 
  line-height: 1.3;
 
  border-radius: 16px;
 
}
 

	
 
#container #mainContent {
 
    max-width: 50em;
 
    margin: 0 0 2rem;
 
    padding: 0;
 
    background: #ffffff;
 
    flex: 1 1 auto;
 
}
 

	
 
#container #sidebar {
 
  background-color: #e6eae1;
 
  padding: 1px 0.5rem 2rem;
 
  margin: 1rem -1rem 0;
 
}
 

	
 
@media screen and (min-width: 30em) {
 
  #container {
 
    display: flex;
 
  }
 
  #container #sidebar {
 
    flex: 1 0 15em;
 
    margin: 1rem 0rem 1rem 2rem;
 
  }
 
}
 

	
 
#container #sidebar li {
 
    text-align: center;
 
    list-style: none;
 
    padding: 3px 10px 3px 10px;
 
    margin: 5px;
 
    border: 1px solid #CCC;
 
    background: #eaf1f1;
 
    background: -moz-linear-gradient(top, #fff, #eaf1f1);
 
    background: -webkit-linear-gradient(top, #fff, #eaf1f1);
 
    background: linear-gradient(to bottom, #fff, #eaf1f1);
 
    filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#eaf1f1', GradientType=0);
 
}
 
#container #sidebar li a:hover { background: #577632; color: #fff; }
 

	
 
#container #sidebar.Sponsors ul li.Sponsors,
 
#container #sidebar.Directors ul li.Directors,
 
#container #sidebar.Eval ul li.Eval,
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -93,92 +93,93 @@
 
  * fundraiser_goal_amount: The amount being matched
 
  * fundraiser_so_far_amount: The amount contributed so far
 
  * fundraiser_donation_count: The number of people who have contributed so far
 
  * fundraiser_donation_count_disclose_threshold: The number of new Sustainers that can be double-matched this fundraiser.
 
      (No, this name makes no sense. We're repurposing an existing model field for this new reason.)
 
* sitefundgoal_endtime: DateTime when sitefundgoal ends.
 

	
 
## Local convenience variables
 

	
 
* sitefundgoal_timeleft: TimeDelta for how much time remains in the current fundraiser
 
* this_match_goal: The amount being matched
 
* this_match_so_far: The amount contributed so far
 
* this_match_remaining: this_match_goal - this_match_so_far
 
* this_match_exceeded: this_match_so_far - this_match_goal
 

	
 
{% endcomment %}
 
{% if sitefundgoal and sitefundgoal.fundraiser_so_far_amount and datetime_now < sitefundgoal.fundraiser_endtime %}
 
{% with this_match_goal=sitefundgoal.fundraiser_goal_amount this_match_so_far=sitefundgoal.fundraiser_so_far_amount %}
 
{% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal.fundraiser_endtime|subtract:datetime_now this_match_exceeded=this_match_so_far|subtract:this_match_goal %}
 
    <div class="fundraiser-top-text ph3 pt2 pb3">
 
      <div class="mw8 center ph2 ph4-ns">
 
      <div class="mt2 mb3 tc">
 
        {% if this_match_remaining <= 0 %}
 
          Thanks to so many donors, we earned our full match!
 
          Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
 
        {% else %}
 
          {% if sitefundgoal_timeleft.total_seconds <= 0 %}
 
            The
 
          {% elif sitefundgoal_timeleft.days == 0 %}
 
            Through today only, the
 
          {% elif sitefundgoal_timeleft.days == 1 %}
 
            Through tomorrow only, the
 
          {% elif sitefundgoal_timeleft.days < 14 %}
 
            For only {{ sitefundgoal_timeleft.days }} more days, the
 
          {% else %}
 
            Until January 15, the
 
          {% endif %}
 
        next ${{ this_match_remaining|floatformat:0|intcomma }} of <a href="/sustainer/">support we receive</a> will be matched!
 

	
 
        {% endif %}
 
      </div>
 

	
 
{% if sitefundgoal.fundraiser_so_far_amount %}
 
<a href="/sustainer/" style="text-decoration: none !important">
 
<div id="siteprogressbar" class="flex items-stretch w-100">
 
  {% if this_match_remaining <= 0 %}
 
    <div class="progress matched pv1 b flex" style="flex-basis: {{ this_match_so_far }}px">
 
      <span id="site-fundraiser-match-count" class="soFarText tc w-100">${{ this_match_goal|floatformat:0|intcomma }} matched!</span>
 
    <div class="progress matched pv1 b flex" style="flex-basis: {{ this_match_exceeded }}px">
 
      <span id="site-fundraiser-match-count" class="soFarText tc w-100">${{this_match_exceeded|floatformat:0|intcomma }} extra given!</span>
 
    </div>
 
    <div class="progress exceeded pv1 b flex" style="flex-basis: {{ this_match_exceeded }}px">
 
      <span id="site-fundraiser-match-count" class="soFarText tc w-100 exceeded">${{this_match_exceeded|floatformat:0|intcomma }} extra given!</span>
 
    </div>
 
  {% else %}
 
    <div class="progress pv1 b flex items-center" style="flex-basis: {{ this_match_so_far }}px">
 
      <span id="site-fundraiser-match-count" class="soFarText tc w-100">${{ this_match_so_far|floatformat:0|intcomma }} matched!</span>
 
    </div>
 
    <div class="final-goal pv1 b flex items-center" style="flex-basis: {{ this_match_remaining }}px">
 
      <span id="site-fundraiser-final-goal" class="goalText tc w-100">${{ this_match_remaining|floatformat:0|intcomma }} to go!</span>
 
    </div>
 
    {% endif %}
 
</div>
 
</a>
 
{% endif %}
 

	
 
</div>
 
</div>
 
{% endwith %}
 
{% endwith %}
 
{% endif %}
 

	
 
    <div class="mw8 center ph2 ph3">
 
      {% block outercontent %}<div id="mainContent"> {% block content %}{% endblock %}</div>{% endblock %}
 
    </div>
 

	
 
    <div id="conservancyfooter" class="mt4-ns pt3 ph3 bg-light-gray">
 
      <p>Connect with Conservancy on
 
        <a href="https://mastodon.technology/@conservancy">Mastodon</a>,
 
        <a href="https://twitter.com/conservancy">Twitter</a>,
 
        <a href="https://www.facebook.com/SoftwareFreedomConservancy/">Facebook</a>,
 
        and <a href="https://www.youtube.com/channel/UCUEeuNvX2UyTTyTYXR9dm_A">YouTube</a>.</p>
 

	
 
      <p><a href="/">Main Page</a> | <a href="/about/contact/">Contact</a> | <a href="/sponsors/">Sponsors</a> | <a href="/privacy-policy/">Privacy Policy</a> | <a href="/feeds/omnibus/">RSS Feed</a></p>
 
      <p>Our privacy policy was last updated <strong>22 December 2020</strong>.</p>
 

	
 
      <p class="copyright_info">
 
      <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by-sa/4.0/88x31.png" /></a>
 
      <br />This page, and all contents herein, unless a license is otherwise
 
      specified, are licensed under a
 
      <a rel="license" href="https://creativecommons.org/licenses/by-sa/4.0">Creative
 
      Commons Attribution-ShareAlike 4.0 International License</a>.</p>
 
    </div>
 
  </body>
 
</html>
0 comments (0 inline, 0 general)