From 707ff1adf5a78ff21df1bbb45ee2a142f8cd6ddc Mon Sep 17 00:00:00 2001 From: Radek Czajka Date: Wed, 26 Jun 2013 14:48:16 +0200 Subject: [PATCH] Better funding tables styling. --- apps/funding/static/funding/funding.css | 2 +- apps/funding/static/funding/funding.scss | 30 +++++++++++-------- .../templates/funding/offer_detail.html | 12 ++++---- apps/funding/templates/funding/wlfund.html | 30 +++++++++---------- 4 files changed, 38 insertions(+), 36 deletions(-) diff --git a/apps/funding/static/funding/funding.css b/apps/funding/static/funding/funding.css index 486f01fab..89dd7aa79 100755 --- a/apps/funding/static/funding/funding.css +++ b/apps/funding/static/funding/funding.css @@ -1 +1 @@ -.funding,.funding-top-header{background:orange;margin:auto;padding:5px 0;position:relative}.funding a.call,.funding-top-header a.call{height:1.2em;width:9em;padding:.35em .5em;margin:.5em;display:inline-block;vertical-align:top;text-align:center;background:rgb(.465%, 59.936%, 63.653%)}.funding .description,.funding-top-header .description{display:inline-block;padding-left:.6em}.funding .description a,.funding-top-header .description a{display:block;color:#000;padding:0 3px}.funding strong,.funding-top-header strong{font-size:1.5em;padding:.2em 0 0}.funding .progress,.funding-top-header .progress{width:95.7em;margin:.3em 0 .4em;border-radius:2em;background-image:url(/static/img/progress-pixel.png);background-repeat:repeat-y;background-color:rgba(236, 109, 0, .5);box-shadow:.1em .1em .1em #888}.funding .progress .piece,.funding-top-header .progress .piece{font-size:1.3em;padding:.3em .5em}.funding .with-button .progress,.funding-top-header .with-button .progress{width:78em}.funding .funding .funding-title-strong,.funding .funding-title,.funding-top-header .funding-title,.funding-top-header .funding-top-header .funding-title-strong{font-size:1.1em}.funding .funding-title-strong,.funding-top-header .funding-title-strong{font-weight:bold;font-size:1.5em}.funding .close,.funding-top-header .close{position:absolute;top:0;right:5px}.funding-top-header{width:97.5em}.wlfund{width:100%;border-collapse:collapse}.wlfund td{padding:0 0 1em 0;text-align:center}.wlfund td:last-child{text-align:right}.wlfund td div{padding:1em;box-shadow:0 2px 0 #DDD}.wlfund .funding-plus td div{background:rgba(13, 126, 133, .2)}.wlfund .funding-minus td div{background:#fff}.honking{background:#018189;font-size:1.5em;padding:.5em;color:#fff;border:0;box-shadow:.2em .2em .3em #888;position:relative}.honking:hover{box-shadow:none;top:.1em;left:.1em}.share a{margin-right:1.5em}.share a img{vertical-align:middle}.funding-handle{position:absolute;top:0;right:0;z-index:2;background:orange;cursor:pointer;padding:.2em 1em;border-radius:0 0 0 1em;font-size:13px}.funding-cover{float:left;margin-right:10px}.funding-details-intro{padding-top:1em}.funding-details-intro h3:first-of-type{margin-top:0} \ No newline at end of file +.funding,.funding-top-header{background:orange;margin:auto;padding:5px 0;position:relative}.funding a.call,.funding-top-header a.call{height:1.2em;width:9em;padding:.35em .5em;margin:.5em;display:inline-block;vertical-align:top;text-align:center;background:rgb(.465%, 59.936%, 63.653%)}.funding .description,.funding-top-header .description{display:inline-block;padding-left:.6em}.funding .description a,.funding-top-header .description a{display:block;color:#000;padding:0 3px}.funding strong,.funding-top-header strong{font-size:1.5em;padding:.2em 0 0}.funding .progress,.funding-top-header .progress{width:95.7em;margin:.3em 0 .4em;border-radius:2em;background-image:url(/static/img/progress-pixel.png);background-repeat:repeat-y;background-color:#f68900;box-shadow:.1em .1em .1em #888}.funding .progress .piece,.funding-top-header .progress .piece{font-size:1.3em;padding:.3em .5em}.funding .with-button .progress,.funding-top-header .with-button .progress{width:78em}.funding .funding .funding-title-strong,.funding .funding-title,.funding-top-header .funding-title,.funding-top-header .funding-top-header .funding-title-strong{font-size:1.1em}.funding .funding-title-strong,.funding-top-header .funding-title-strong{font-weight:bold;font-size:1.5em}.funding .close,.funding-top-header .close{position:absolute;top:0;right:5px}.funding-top-header{width:97.5em}.wlfund{width:100%;border-spacing:0}.wlfund td{padding:1em .5em 1em;text-align:center;border-top:1em solid rgba(255, 255, 255, 0);border-bottom:2px solid #DDD;background-clip:padding-box;-moz-background-clip:padding;-webkit-background-clip:padding}.wlfund td.oneline{white-space:nowrap}.wlfund td:last-child{text-align:right}.wlfund .funding-plus td{background-color:#cfe5e7}.wlfund .funding-minus td{background-color:#fff}.honking{background:#018189;font-size:1.5em;padding:.5em;color:#fff;border:0;box-shadow:.2em .2em .3em #888;position:relative}.honking:hover{box-shadow:none;top:.1em;left:.1em}.share a{margin-right:1.5em}.share a img{vertical-align:middle}.funding-handle{position:absolute;top:0;right:0;z-index:2;background:orange;cursor:pointer;padding:.2em 1em;border-radius:0 0 0 1em;font-size:13px}.funding-cover{float:left;margin-right:10px}.funding-details-intro{padding-top:1em}.funding-details-intro h3:first-of-type{margin-top:0} \ No newline at end of file diff --git a/apps/funding/static/funding/funding.scss b/apps/funding/static/funding/funding.scss index f26046b90..13c6ce062 100755 --- a/apps/funding/static/funding/funding.scss +++ b/apps/funding/static/funding/funding.scss @@ -38,7 +38,7 @@ border-radius: 2em; background-image: url(/static/img/progress-pixel.png); background-repeat: repeat-y; - background-color: fade-out(#ec6d00, .5); + background-color: mix(#ec6d00, orange, .5); box-shadow: .1em .1em .1em #888; } .with-button .progress { @@ -68,28 +68,32 @@ .wlfund { width: 100%; - border-collapse: collapse; + border-spacing:0; td { - padding: 0 0 1em 0; + padding: 1em .5em 1em; text-align: center; + border-top: 1em solid rgba(255, 255, 255, 0); + border-bottom: 2px solid #DDDDDD; + + background-clip: padding-box; + -moz-background-clip: padding; + -webkit-background-clip: padding; + } + td.oneline { + white-space: nowrap; } td:last-child { text-align: right; } - td div { - padding: 1em; - box-shadow: 0 2px 0 #DDDDDD; + .funding-plus td { + background-color: mix(#0D7E85, white, .2); } - .funding-plus td div { - background: fade-out(#0D7E85, .8); - } - - .funding-minus td div { - background: white; + .funding-minus td { + background-color: white; } } @@ -145,4 +149,4 @@ h3:first-of-type { margin-top: 0; } -} \ No newline at end of file +} diff --git a/apps/funding/templates/funding/offer_detail.html b/apps/funding/templates/funding/offer_detail.html index 905e03b46..5cd3e0970 100755 --- a/apps/funding/templates/funding/offer_detail.html +++ b/apps/funding/templates/funding/offer_detail.html @@ -74,20 +74,20 @@ {% autopaginate fundings 10 %} {% for funding in fundings %} -
{{ funding.payed_at.date }}
-
+ {{ funding.payed_at.date }} + {% if funding.name %} {{ funding.name }} {% else %} {% trans "Anonymous" %} {% endif %} -
-
{{ funding.amount }} zł
-
+ + {{ funding.amount }} zł + {% for perk in funding.perks.all %} {{ perk.name }}{% if not forloop.last %},{% endif %} {% endfor %}  -
+ {% endfor %} diff --git a/apps/funding/templates/funding/wlfund.html b/apps/funding/templates/funding/wlfund.html index 54416fad6..adffe7bfd 100755 --- a/apps/funding/templates/funding/wlfund.html +++ b/apps/funding/templates/funding/wlfund.html @@ -19,38 +19,36 @@ from successful fundraisers.{% endblocktrans %}

{% trans "Spending these remaining funds is recorded in this table." %}

- - - - - + + + + {% for tag, entry in log %} {% if tag == 'spent' %} - - + - - + {{ entry.book }} + + {% else %} - - + - - + {{ entry }} + + {% endif %} {% endfor %}
{% trans "Date" %}:
{% trans "Operation" %}:
{% trans "Amount" %}:
{% trans "Balance" %}:
{% trans "Date" %}:{% trans "Operation" %}:{% trans "Amount" %}:{% trans "Balance" %}:
{{ entry.timestamp }}
{% trans "Money spent on publishing the book" %}: +
{{ entry.timestamp }}{% trans "Money spent on publishing the book" %}: - {{ entry.book }}
-{{ entry.amount }} zł
{{ entry.total }} zł
-{{ entry.amount }} zł{{ entry.total }} zł
{{ entry.end }}
{% trans "Money remaining from the fundraiser for" %}: +
{{ entry.end }}{% trans "Money remaining from the fundraiser for" %}: - {{ entry }}
+{{ entry.wlfund }} zł
{{ entry.total }} zł
+{{ entry.wlfund }} zł{{ entry.total }} zł
- {% endblock %} -- 2.20.1