From 50577a22477d488c30b6c82c26aeab9aed65d799 Mon Sep 17 00:00:00 2001 From: Jeppe Ernst Date: Mon, 30 Apr 2018 15:03:08 +0200 Subject: [PATCH 01/56] multistage donation counter needs some clean up --- _config.yml | 6 +- _data/da/common.yml | 2 +- _data/en/common.yml | 2 +- _layouts/indexpage.html | 13 ++- _pages/index-da.md | 14 ++- _scss/base/_typography.scss | 23 +++- _scss/base/_variables.scss | 3 + _scss/module/_donationCounter.scss | 163 ++++++++++++++++++++++++----- _scss/module/_indexpage.scss | 3 +- _scss/module/_sections.scss | 2 +- assets/style/main.scss | 4 +- 11 files changed, 193 insertions(+), 42 deletions(-) diff --git a/_config.yml b/_config.yml index b26b2d61..6b1bc590 100644 --- a/_config.yml +++ b/_config.yml @@ -21,8 +21,10 @@ description: >- # this means to ignore newlines until "baseurl:" baseurl: "" # the subpath of your site, e.g. /blog url: "https://ulovliglogning.dk" # the base hostname & protocol for your site, e.g. http://example.com donationCounter: - donated: 249315 - goal: 250000 + donated: 256315 + goal1: 100000 + goal2: 250000 + goal3: 400000 # multilanguage support languages: ["da", "en"] diff --git a/_data/da/common.yml b/_data/da/common.yml index 21d3091d..4b3e8ea2 100644 --- a/_data/da/common.yml +++ b/_data/da/common.yml @@ -13,7 +13,7 @@ global: da: Dansk en: Engelsk donation: - text: doneret af + text: doneret i alt currency: ",-" sub: Donationer opdateres pt. manuelt mobilepayLink: https://mobilepay.dk/da-dk/pages/betal.aspx?phone=004540456&comment=Til%20kampen%20imod%20den%20Ulovlige%20Logning!&t=d \ No newline at end of file diff --git a/_data/en/common.yml b/_data/en/common.yml index 3aa5c117..a500e693 100644 --- a/_data/en/common.yml +++ b/_data/en/common.yml @@ -13,6 +13,6 @@ global: da: Danish en: English donation: - text: donated of + text: donated in total currency: " DKK" sub: Donations are updated manually \ No newline at end of file diff --git a/_layouts/indexpage.html b/_layouts/indexpage.html index a9ddda60..ee20aa99 100644 --- a/_layouts/indexpage.html +++ b/_layouts/indexpage.html @@ -5,11 +5,14 @@ layout: default {% for section in page.sections %}
{% if forloop.first %} -
- - {{ site.donationCounter.donated | intcomma: '.' }}{{ global.donation.currency }} {{ global.donation.text }} {{ site.donationCounter.goal | intcomma: '.' }}{{ global.donation.currency }} - {{ global.donation.sub }} - +
+
+ {{ site.donationCounter.donated | intcomma: '.' }}{{ global.donation.currency }} {{ global.donation.text }} + {{ global.donation.sub }} +
+
+
{{ site.donationCounter.goal1 | slice: 0,3 }}K
{{ site.donationCounter.goal2 | slice: 0,3 }}K
{{ site.donationCounter.goal3 | slice: 0,3 }}K
+