[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ops-www] branch master updated: merchant btn stuff
|
From: |
gnunet |
|
Subject: |
[taler-taler-ops-www] branch master updated: merchant btn stuff |
|
Date: |
Sun, 31 Mar 2024 15:02:37 +0200 |
This is an automated email from the git hooks/post-receive script.
nora-grothoff pushed a commit to branch master
in repository taler-ops-www.
The following commit(s) were added to refs/heads/master by this push:
new f1963da merchant btn stuff
f1963da is described below
commit f1963daa801162dd3fbccad2a2e0c70d756b3d80
Author: Nullptrderef <nullptrderef@proton.me>
AuthorDate: Sun Mar 31 15:02:34 2024 +0200
merchant btn stuff
---
locale/de/LC_MESSAGES/messages.po | 2 +-
locale/en/LC_MESSAGES/messages.po | 2 +-
locale/fr/LC_MESSAGES/messages.po | 2 +-
locale/messages.pot | 2 +-
static/scss/global.scss | 1 +
static/scss/pages/fees.scss | 32 ----------------------
.../scss/{pages/fees.scss => standard-layout.scss} | 22 +++++----------
template/merchants.html.j2 | 12 ++++----
8 files changed, 18 insertions(+), 57 deletions(-)
diff --git a/locale/de/LC_MESSAGES/messages.po
b/locale/de/LC_MESSAGES/messages.po
index 7fc1f4e..991d898 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-03-31 14:54+0200\n"
+"POT-Creation-Date: 2024-03-31 15:02+0200\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/";
diff --git a/locale/en/LC_MESSAGES/messages.po
b/locale/en/LC_MESSAGES/messages.po
index 0c08250..451fbc5 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-03-31 14:54+0200\n"
+"POT-Creation-Date: 2024-03-31 15:02+0200\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"
diff --git a/locale/fr/LC_MESSAGES/messages.po
b/locale/fr/LC_MESSAGES/messages.po
index 1bc6533..f0f54af 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-03-31 14:54+0200\n"
+"POT-Creation-Date: 2024-03-31 15:02+0200\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/";
diff --git a/locale/messages.pot b/locale/messages.pot
index 5f1f009..ab207a8 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-03-31 14:54+0200\n"
+"POT-Creation-Date: 2024-03-31 15:02+0200\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"
diff --git a/static/scss/global.scss b/static/scss/global.scss
index a9ff185..d662c29 100644
--- a/static/scss/global.scss
+++ b/static/scss/global.scss
@@ -2,3 +2,4 @@
@use './fonts/fonts.scss';
@use './footer.scss';
@use './util.scss';
+@use './standard-layout.scss';
diff --git a/static/scss/pages/fees.scss b/static/scss/pages/fees.scss
index df02272..47d0baf 100644
--- a/static/scss/pages/fees.scss
+++ b/static/scss/pages/fees.scss
@@ -13,35 +13,3 @@
}
}
}
-.standard-layout-render {
- h2 {
- @apply text-xl font-medium;
- }
- h2,
- p {
- &:not(:first-child) {
- @apply mt-3;
- }
- &:not(:last-child) {
- @apply mb-3;
- }
- }
- table {
- @apply border-spacing-2 border-separate border border-slate-500
rounded-3xl bg-black bg-opacity-5 border-opacity-50;
- tr {
- &:hover {
- th,
- td {
- @apply bg-opacity-10;
- }
- }
- th,
- td {
- @apply p-2 bg-black bg-opacity-5 rounded-2xl transition-all
cursor-default;
- }
- th {
- @apply text-left font-medium;
- }
- }
- }
-}
diff --git a/static/scss/pages/fees.scss b/static/scss/standard-layout.scss
similarity index 66%
copy from static/scss/pages/fees.scss
copy to static/scss/standard-layout.scss
index df02272..049a590 100644
--- a/static/scss/pages/fees.scss
+++ b/static/scss/standard-layout.scss
@@ -1,19 +1,8 @@
-.toggleable {
- @apply bg-black bg-opacity-[0.03] hover:bg-opacity-[0.05] rounded-2xl
transition-all;
- &:not(:last-child) {
- @apply mb-3;
- }
- .toggle-trigger {
- @apply cursor-pointer p-6;
- + .toggle-content {
- @apply p-6 pt-0 -mt-6;
- &.hidden {
- display: none;
- }
- }
- }
-}
+// Standard layout helpers for "vanilla" pages; think fees page or a small
manual document - something where specialized styles are absolutely overkill in
every way
.standard-layout-render {
+ h1 {
+ @apply text-2xl font-medium;
+ }
h2 {
@apply text-xl font-medium;
}
@@ -26,6 +15,9 @@
@apply mb-3;
}
}
+ b {
+ @apply font-semibold;
+ }
table {
@apply border-spacing-2 border-separate border border-slate-500
rounded-3xl bg-black bg-opacity-5 border-opacity-50;
tr {
diff --git a/template/merchants.html.j2 b/template/merchants.html.j2
index 60d17b5..274d4c0 100644
--- a/template/merchants.html.j2
+++ b/template/merchants.html.j2
@@ -63,7 +63,7 @@
<a
target="_blank"
href="https://tutorials.taler.net/qr";
- class="button accent"
+ class="button accent mt-3"
>{% trans %}Watch tutorial{% endtrans %}</a
>
</p>
@@ -94,7 +94,7 @@
<a
target="_blank"
href="https://wordpress.org/plugins/gnu-taler-payment-for-woocommerce/";
- class="button accent"
+ class="button accent mt-3"
>{% trans %}WooCommerce plugin{% endtrans %}</a
>
</p>
@@ -124,7 +124,7 @@
<a
target="_blank"
href="https://github.com/pretix/pretix-taler";
- class="button accent"
+ class="button accent mt-3"
>{% trans %}Pretix plugin{% endtrans %}</a
>
</p>
@@ -155,7 +155,7 @@
<a
target="_blank"
href="https://git.taler.net/joomla-payage-taler-plugin.git/tree/README.md";
- class="button accent"
+ class="button accent mt-3"
>{% trans %}Joomla! plugin{% endtrans %}</a
>
</p>
@@ -185,7 +185,7 @@
<a
target="_blank"
href="https://docs.taler.net/taler-merchant-pos-terminal.html";
- class="button accent"
+ class="button accent mt-3"
>{% trans %}App manual{% endtrans %}</a
>
</p>
@@ -216,7 +216,7 @@
<a
target="_blank"
href="https://tutorials.taler.net/";
- class="button accent"
+ class="button accent mt-3"
>{% trans %}Watch tutorials{% endtrans %}</a
>
</p>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-ops-www] branch master updated: merchant btn stuff,
gnunet <=