Merge branch 'master' into rwd

[wolnelektury.git] / apps / funding / templates / funding / tags / funding.html

diff --git a/apps/funding/templates/funding/tags/funding.html b/apps/funding/templates/funding/tags/funding.html
index ffe326e..4628251 100755 (executable)
--- a/apps/funding/templates/funding/tags/funding.html
+++ b/apps/funding/templates/funding/tags/funding.html
@@ -5,16 +5,15 @@
 <div class="funding {{ add_class }}" data-offer-id="{{offer.id}}" style="">
     {% if closeable %}<a href="#" class="close">X</a>{% endif %}
     {% if link and is_current %}
-        <div style="float:left; padding-right: .6em;">
+        <div class="call-area">
             <a class="call honking" href="{% url 'funding_current' offer.slug %}">
                 {% trans "Support!" %}</a>
-            <div style="text-align: center; margin: auto;">
+            <div class="learn-more">
                 <a href="{% url 'infopage' 'wesprzyj' %}">{% trans "Learn more" %}</a>
             </div>
         </div>
     {% endif %}
-    <div class="description {% if link and is_current %}with-button{% endif %}"
-        style="display: inline-block;">
+    <div class="description {% if link and is_current %}with-button{% endif %}">
     {% if link %}<a href="{% if is_current %}{% url 'funding_current' offer.slug %}{% else %}{{ offer.get_absolute_url }}{% endif %}">{% endif %}
     {% if show_title %}
         {% if is_current and show_title_calling %}<strong style="margin-right: .6em;">{% trans "Help free the book!" %}</strong>{% endif %}
@@ -25,18 +24,18 @@
         style="text-align: center; background-size: {{ percentage|stringformat:'.2f' }}% 1px;"
     >
         {% if sum %}
-            <span class="piece" style="float:left">{% trans "collected" %}: {{ sum }} zł</span>
+            <span class="piece progress-collected">{% trans "collected" %}: {{ sum }} zł</span>
         {% endif %}
         {% if not is_win %}
-            <span class="piece" style="float: right">{% trans "needed" %}: {{ offer.target }} zł</span>
+            <span class="piece progress-target"><span class="{% if sum %}progress-extralabel{% endif %}">{% trans "needed" %}: </span>{{ offer.target }} zł</span>
         {% endif %}
         {% if is_current %}
-            <span class="piece" style="display:inline-block;margin-right: 0em;">{% trans "until fundraiser end" %}:
+            <span class="piece progress-until"><span class="progress-extralabel">{% trans "until fundraiser end" %}:</span>
                 <span class="countdown inline" data-until='{{ offer.end|date_to_utc:True|utc_for_js }}'></span>
             </span>
+        {% else %}
+            <div style="clear: both"></div>
         {% endif %}
-
-        <div style="clear: both"></div>
     </div>
     {% if link %}</a>{% endif %}
     </div>