Changeset - 7a49bf08d681
[Not reviewed]
0 2 0
Daniel Takamori (pono) - 2 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
...
 
@@ -281,66 +281,74 @@ body > header {
 
  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;
www/conservancy/templates/base_conservancy.html
Show inline comments
...
 
@@ -117,50 +117,51 @@
 
          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">
0 comments (0 inline, 0 general)