diff --git a/public/assets/css/main.css b/public/assets/css/main.css index b07d7a2..c70473d 100644 --- a/public/assets/css/main.css +++ b/public/assets/css/main.css @@ -649,7 +649,7 @@ section.update-signup div.circle { /* Progress */ .donation-progress { - padding: 50px 20px; + padding: 72px 72px; border-radius: 10px; background: var(--bg-shade-0); grid-column: span 2; @@ -670,6 +670,11 @@ section.update-signup div.circle { text-decoration: underline; } +.donation-progress .cucui-dance { + height: 2em; + margin-bottom: -0.6em; +} + .progress-bar { position: relative; display: block; @@ -678,11 +683,20 @@ section.update-signup div.circle { margin: 1rem 0; border-radius: 6px; background: var(--bg-shade-3); - overflow: hidden; } -.progress-bar-inner { +.progress-bar-real, +.progress-bar-capped { + position: absolute; height: 100%; + border-radius: 6px; + width: var(--progress-bar-width); +} +.progress-bar-capped { background-color: var(--accent-shade-0); + max-width: 100%; +} +.progress-bar-real { + background-color: var(--green-shade-1); } .all-progress-lists { diff --git a/public/assets/images/ganon.apng b/public/assets/images/ganon.apng new file mode 100644 index 0000000..9a6adb6 Binary files /dev/null and b/public/assets/images/ganon.apng differ diff --git a/src/server.js b/src/server.js index 9a017ce..853e33e 100644 --- a/src/server.js +++ b/src/server.js @@ -150,6 +150,9 @@ app.engine('handlebars', handlebars({ neq(value1, value2) { return value1 !== value2; }, + greaterThan(value1, value2) { + return value1 > value2; + }, slug(string) { return string.toLowerCase().replaceAll(/ /g, '-'); }, diff --git a/views/account/upgrade.handlebars b/views/account/upgrade.handlebars index ae1ff64..73c398a 100644 --- a/views/account/upgrade.handlebars +++ b/views/account/upgrade.handlebars @@ -38,8 +38,9 @@

{{ locale.upgrade.description }}

-
-
+
+
+

{{{ locale.donation.progress }}} diff --git a/views/progress.handlebars b/views/progress.handlebars index 274c2d1..291ccc5 100644 --- a/views/progress.handlebars +++ b/views/progress.handlebars @@ -16,9 +16,10 @@

-

Donation goal

-
-
+

Donation goal {{#if (greaterThan donationCache.completed_real 100) }}An animated image of CucuĂ­ Ganon dancing{{/if}}

+
+
+

{{{ locale.donation.progress }}} {{{ locale.donation.upgradePush }}}