[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] 05/06: more landing changes
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] 05/06: more landing changes |
|
Date: |
Sun, 25 Feb 2024 06:38:02 +0100 |
This is an automated email from the git hooks/post-receive script.
nora pushed a commit to branch master
in repository taler-ops-www.
commit 8e304f012da6e174424b919f04580b55f52514e8
Author: Nullptrderef <nullptrderef@national.shitposting.agency>
AuthorDate: Sun Feb 25 04:59:25 2024 +0100
more landing changes
---
common/base.j2 | 30 +++++++++++---------
locale/de/LC_MESSAGES/messages.po | 24 ++++++++--------
locale/en/LC_MESSAGES/messages.po | 22 +++++++--------
locale/fr/LC_MESSAGES/messages.po | 22 +++++++--------
locale/messages.pot | 22 +++++++--------
static/scss/pages/landing.scss | 3 ++
static/scss/util.scss | 10 +++++--
tailwind.config.js | 6 ++++
template/index.html.j2 | 58 +++++++++++++++++++--------------------
9 files changed, 108 insertions(+), 89 deletions(-)
diff --git a/common/base.j2 b/common/base.j2
index b6bb940..ac099e9 100644
--- a/common/base.j2
+++ b/common/base.j2
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
<html lang="{{ lang }}">
<head>
<meta charset="UTF-8" />
@@ -14,24 +14,28 @@
<meta property="og:image" content="https://taler.net/favicon.ico"; />
<meta property="og:image" content="/favicon.ico" />
{% include "common/header.j2.inc" %} {% block head_content %}
- <!-- WARN: NO HEAD BLOCK SPECIFIED, USING DEFAULT -->
- <meta
- property="og:image"
- content="{{ url_static('images/unsorted/favicon.png') }}"
- />
- <meta
- name="description"
- content="{{ _('Taler Operations AG, Biel, Switzerland') }}"
- />
- <meta property="og:title" content="{% trans %}Taler Operations AG, Biel,
Switzerland{% endtrans %}" />
+ <!-- WARN: NO HEAD BLOCK SPECIFIED, USING DEFAULT -->
+ <meta
+ property="og:image"
+ content="{{ url_static('images/unsorted/favicon.png') }}"
+ />
+ <meta
+ name="description"
+ content="{{ _('Taler Operations AG, Biel, Switzerland') }}"
+ />
+ <meta
+ property="og:title"
+ content="{% trans %}Taler Operations AG, Biel, Switzerland{% endtrans %}"
+ />
{% endblock %}
</head>
<body class="font-sans font-normal">
<div id="page-container">
<div id="content-wrap">
- {% include "common/navigation/index.j2.inc" %} {% block body_content
%}{%
- endblock %} {% include "common/footer.j2.inc" %}
+ {% include "common/navigation/index.j2.inc" %}
+ <div id="approot">{% block body_content %}{% endblock %}</div>
+ {% include "common/footer.j2.inc" %}
</div>
</div>
</body>
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 4443b9f..7fafc82 100644
--- a/locale/de/LC_MESSAGES/messages.po
+++ b/locale/de/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 04:42+0100\n"
+"POT-Creation-Date: 2024-02-25 04:58+0100\n"
"PO-Revision-Date: 2024-02-24 20:06+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: German <https://weblate.taler.net/projects/taler-ops/website/";
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: Weblate 5.2.1\n"
"Generated-By: Babel 2.6.0\n"
-#: common/base.j2:24 common/base.j2:26
+#: common/base.j2:24 common/base.j2:28
msgid "Taler Operations AG, Biel, Switzerland"
msgstr "Taler Operations AG, Biel, Schweiz"
@@ -138,11 +138,11 @@ msgstr ""
msgid "Skip to main content"
msgstr "Navigationsmenü überspringen"
-#: common/navigation/items.j2.inc:10 template/index.html.j2:78
+#: common/navigation/items.j2.inc:10 template/index.html.j2:76
msgid "For Merchants"
msgstr "Für Händler"
-#: common/navigation/items.j2.inc:15 template/index.html.j2:60
+#: common/navigation/items.j2.inc:15 template/index.html.j2:58
msgid "For Users"
msgstr "Für Kunden"
@@ -166,11 +166,13 @@ msgid ""
"Switzerland."
msgstr "Taler Operations betreibt das Taler-Bezahlsystem in der Schweiz."
-#: template/index.html.j2:15
-msgid "Welcome to <span>Taler Operations</span>!"
+#: template/index.html.j2:16
+#, fuzzy
+#| msgid "Welcome to <span>Taler Operations</span>!"
+msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr "Willkommen bei <span>Taler Operations</span>!"
-#: template/index.html.j2:19
+#: template/index.html.j2:20
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
msgstr "Taler Operations betreibt das Taler-Bezahlsystem in der Schweiz."
@@ -185,7 +187,7 @@ msgstr ""
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:62
+#: template/index.html.j2:60
msgid ""
"Taler provides the world with a payment solution that definitely makes sense "
"in a society where privacy, data safety, technical security, and reliability "
@@ -196,11 +198,11 @@ msgstr ""
"höchsten Datenschutz, technische Sicherheit und uneingeschränkte "
"Verlässlichkeit verlangen."
-#: template/index.html.j2:68
+#: template/index.html.j2:66
msgid "Pay with Taler"
msgstr "Mit Taler bezahlen"
-#: template/index.html.j2:80
+#: template/index.html.j2:78
msgid ""
"Taler offers efficient payments and backoffice procedures with security, "
"privacy and data minimization by design. Payers and payees can rely on "
@@ -211,7 +213,7 @@ msgstr ""
"Händler und Kunden können sich auf Technologie verlassen und müssen nicht "
"mehr auf blindes Vertrauen setzen."
-#: template/index.html.j2:88
+#: template/index.html.j2:86
msgid "Integrate"
msgstr "Integration"
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 200c780..17c8ba2 100644
--- a/locale/en/LC_MESSAGES/messages.po
+++ b/locale/en/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 04:42+0100\n"
+"POT-Creation-Date: 2024-02-25 04:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.6.0\n"
-#: common/base.j2:24 common/base.j2:26
+#: common/base.j2:24 common/base.j2:28
msgid "Taler Operations AG, Biel, Switzerland"
msgstr ""
@@ -114,11 +114,11 @@ msgstr ""
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:10 template/index.html.j2:78
+#: common/navigation/items.j2.inc:10 template/index.html.j2:76
msgid "For Merchants"
msgstr ""
-#: common/navigation/items.j2.inc:15 template/index.html.j2:60
+#: common/navigation/items.j2.inc:15 template/index.html.j2:58
msgid "For Users"
msgstr ""
@@ -140,11 +140,11 @@ msgid ""
"Switzerland."
msgstr ""
-#: template/index.html.j2:15
-msgid "Welcome to <span>Taler Operations</span>!"
+#: template/index.html.j2:16
+msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr ""
-#: template/index.html.j2:19
+#: template/index.html.j2:20
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
msgstr ""
@@ -159,25 +159,25 @@ msgstr ""
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:62
+#: template/index.html.j2:60
msgid ""
"Taler provides the world with a payment solution that definitely makes sense "
"in a society where privacy, data safety, technical security, and reliability "
"become more and more crucial for everyone."
msgstr ""
-#: template/index.html.j2:68
+#: template/index.html.j2:66
msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:80
+#: template/index.html.j2:78
msgid ""
"Taler offers efficient payments and backoffice procedures with security, "
"privacy and data minimization by design. Payers and payees can rely on "
"technology, and do not need to purely rely on trust anymore."
msgstr ""
-#: template/index.html.j2:88
+#: template/index.html.j2:86
msgid "Integrate"
msgstr ""
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 9249a34..79e2414 100644
--- a/locale/fr/LC_MESSAGES/messages.po
+++ b/locale/fr/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 04:42+0100\n"
+"POT-Creation-Date: 2024-02-25 04:58+0100\n"
"PO-Revision-Date: 2024-02-12 18:13+0000\n"
"Last-Translator: Stefan Kügel <skuegel@web.de>\n"
"Language-Team: French <https://weblate.taler.net/projects/taler-ops/website/";
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: Weblate 5.2.1\n"
"Generated-By: Babel 2.8.0\n"
-#: common/base.j2:24 common/base.j2:26
+#: common/base.j2:24 common/base.j2:28
msgid "Taler Operations AG, Biel, Switzerland"
msgstr "Taler Operations AG, Bienne, Suisse"
@@ -130,11 +130,11 @@ msgstr ""
msgid "Skip to main content"
msgstr "Aller au menu principal"
-#: common/navigation/items.j2.inc:10 template/index.html.j2:78
+#: common/navigation/items.j2.inc:10 template/index.html.j2:76
msgid "For Merchants"
msgstr ""
-#: common/navigation/items.j2.inc:15 template/index.html.j2:60
+#: common/navigation/items.j2.inc:15 template/index.html.j2:58
msgid "For Users"
msgstr ""
@@ -158,11 +158,11 @@ msgid ""
"Switzerland."
msgstr "Taler Operations AG, Bienne, Suisse"
-#: template/index.html.j2:15
-msgid "Welcome to <span>Taler Operations</span>!"
+#: template/index.html.j2:16
+msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr ""
-#: template/index.html.j2:19
+#: template/index.html.j2:20
#, fuzzy
#| msgid "Taler Operations AG, Biel, Switzerland"
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
@@ -179,25 +179,25 @@ msgstr ""
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:62
+#: template/index.html.j2:60
msgid ""
"Taler provides the world with a payment solution that definitely makes sense "
"in a society where privacy, data safety, technical security, and reliability "
"become more and more crucial for everyone."
msgstr ""
-#: template/index.html.j2:68
+#: template/index.html.j2:66
msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:80
+#: template/index.html.j2:78
msgid ""
"Taler offers efficient payments and backoffice procedures with security, "
"privacy and data minimization by design. Payers and payees can rely on "
"technology, and do not need to purely rely on trust anymore."
msgstr ""
-#: template/index.html.j2:88
+#: template/index.html.j2:86
msgid "Integrate"
msgstr ""
diff --git a/locale/messages.pot b/locale/messages.pot
index 86b3634..fccb3dc 100644
--- a/locale/messages.pot
+++ b/locale/messages.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2024-02-25 04:42+0100\n"
+"POT-Creation-Date: 2024-02-25 04:58+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Generated-By: Babel 2.12.1\n"
-#: common/base.j2:24 common/base.j2:26
+#: common/base.j2:24 common/base.j2:28
msgid "Taler Operations AG, Biel, Switzerland"
msgstr ""
@@ -114,11 +114,11 @@ msgstr ""
msgid "Skip to main content"
msgstr ""
-#: common/navigation/items.j2.inc:10 template/index.html.j2:78
+#: common/navigation/items.j2.inc:10 template/index.html.j2:76
msgid "For Merchants"
msgstr ""
-#: common/navigation/items.j2.inc:15 template/index.html.j2:60
+#: common/navigation/items.j2.inc:15 template/index.html.j2:58
msgid "For Users"
msgstr ""
@@ -140,11 +140,11 @@ msgid ""
"Switzerland."
msgstr ""
-#: template/index.html.j2:15
-msgid "Welcome to <span>Taler Operations</span>!"
+#: template/index.html.j2:16
+msgid "Welcome to <span class=\"text-accent-pure\">Taler Operations</span>!"
msgstr ""
-#: template/index.html.j2:19
+#: template/index.html.j2:20
msgid "Taler Operations runs the GNU Taler payment system in Switzerland."
msgstr ""
@@ -159,25 +159,25 @@ msgstr ""
msgid "Swiss Franc coin with GNU head as face value"
msgstr ""
-#: template/index.html.j2:62
+#: template/index.html.j2:60
msgid ""
"Taler provides the world with a payment solution that definitely makes "
"sense in a society where privacy, data safety, technical security, and "
"reliability become more and more crucial for everyone."
msgstr ""
-#: template/index.html.j2:68
+#: template/index.html.j2:66
msgid "Pay with Taler"
msgstr ""
-#: template/index.html.j2:80
+#: template/index.html.j2:78
msgid ""
"Taler offers efficient payments and backoffice procedures with security, "
"privacy and data minimization by design. Payers and payees can rely on "
"technology, and do not need to purely rely on trust anymore."
msgstr ""
-#: template/index.html.j2:88
+#: template/index.html.j2:86
msgid "Integrate"
msgstr ""
diff --git a/static/scss/pages/landing.scss b/static/scss/pages/landing.scss
new file mode 100644
index 0000000..c61c718
--- /dev/null
+++ b/static/scss/pages/landing.scss
@@ -0,0 +1,3 @@
+.welcome-to-taler-text {
+ font-weight: 550;
+}
diff --git a/static/scss/util.scss b/static/scss/util.scss
index c0c6702..e6de4ac 100644
--- a/static/scss/util.scss
+++ b/static/scss/util.scss
@@ -1,6 +1,12 @@
@use './link' as *;
-main#maincontent:not(.no-full-width) {
- @apply max-w-screen-xl px-8 md:px-16;
+#approot {
+ @apply flex flex-col items-center;
+ main#maincontent:not(.no-auto-width) {
+ @apply max-w-screen-xl px-8 md:px-16;
+ }
+ main#maincontent:not(.no-auto-margin) {
+ @apply my-12;
+ }
}
.link {
@include link;
diff --git a/tailwind.config.js b/tailwind.config.js
index f62fe19..437237a 100644
--- a/tailwind.config.js
+++ b/tailwind.config.js
@@ -22,6 +22,12 @@ module.exports = {
theme: {
extend: {
// things that are new go here
+ colors: {
+ accent: {
+ pure: '#0042B3',
+ // todo: add accent shades
+ },
+ },
},
// things to replace go below here:
fontFamily: {
diff --git a/template/index.html.j2 b/template/index.html.j2
index 81db9d6..01ec6f6 100644
--- a/template/index.html.j2
+++ b/template/index.html.j2
@@ -5,38 +5,36 @@
name="description"
content="{% trans %}Taler Operations is the entity running the GNU Taler
payment system in Switzerland.{% endtrans %}"
/>
+<link href="{{ url_static('scss/pages/landing.scss') }}" rel="stylesheet" />
{# <meta name="author" content="" /> #} {% endblock %} {% block body_content %}
<main id="maincontent">
- <div class="hero">
- <div class="row">
- <div class="col-sm-7">
- <div class="ban_left">
- <h3>
- {% trans %}Welcome to <span>Taler Operations</span>!{% endtrans %}
- </h3>
- <br />
- <h4>
- {% trans %}Taler Operations runs the GNU Taler payment system in
- Switzerland.{% endtrans %}
- </h4>
- <br /><br />
- <h4>
- {% trans %}Taler Operations is not supervised by the Swiss
Financial
- Market Supervisory Authority (FINMA). However, the cover amount (in
- Swiss francs) of your eCHF is deposited in a separate bank
- account.{% endtrans %}
- </h4>
- </div>
- </div>
- <div class="col-sm-5">
- <div class="ban_rt">
- <img
- src="{{ url_static('images/unsorted/swiss_coin_5.png') }}"
- alt="{% trans %}Swiss Franc coin with GNU head as face value{%
endtrans %}"
- width="100px"
- />
- </div>
- </div>
+ <div
+ class="hero flex flex-col md:flex-row min-h-[80vh] items-center
justify-center gap-12"
+ >
+ <div class="left-section md:flex-1">
+ <h1 class="welcome-to-taler-text text-3xl">
+ {% trans %}Welcome to
+ <span class="text-accent-pure">Taler Operations</span>!{% endtrans %}
+ </h1>
+ <p class="text-xl mt-3 mb-2">
+ {% trans %}Taler Operations runs the GNU Taler payment system in
+ Switzerland.{% endtrans %}
+ </p>
+ <p class="text-xl notice-text">
+ {% trans %}Taler Operations is not supervised by the Swiss Financial
+ Market Supervisory Authority (FINMA). However, the cover amount (in
+ Swiss francs) of your eCHF is deposited in a separate bank account.{%
+ endtrans %}
+ </p>
+ </div>
+ <div
+ class="right-section md:flex-1 flex flex-col items-center justify-center"
+ >
+ <img
+ src="{{ url_static('images/unsorted/swiss_coin_5.png') }}"
+ alt="{% trans %}Swiss Franc coin with GNU head as face value{%
endtrans %}"
+ width="256px"
+ />
</div>
</div>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ops-www] branch master updated (61b5ecd -> af2b757), gnunet, 2024/02/25
- [taler-taler-ops-www] 01/06: force it on top, gnunet, 2024/02/25
- [taler-taler-ops-www] 03/06: some more stuff, gnunet, 2024/02/25
- [taler-taler-ops-www] 05/06: more landing changes,
gnunet <=
- [taler-taler-ops-www] 02/06: some link styles, gnunet, 2024/02/25
- [taler-taler-ops-www] 04/06: things, gnunet, 2024/02/25
- [taler-taler-ops-www] 06/06: finish the landing page, gnunet, 2024/02/25