From ade85c6880392690581c65e435309b2897ee0e0f Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Thu, 3 Jul 2025 12:48:23 +0400 Subject: [PATCH 1/9] fix: replace unicode with regular double quotes --- www/src/page-layout.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/src/page-layout.html b/www/src/page-layout.html index 4fe178eb..28ffde56 100644 --- a/www/src/page-layout.html +++ b/www/src/page-layout.html @@ -9,7 +9,7 @@ {{ config.mail_domain }} {{ pagename }} - + From 79c4e85eeaeefdedb4a5aa2064554b60b4d2863f Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Thu, 3 Jul 2025 12:57:07 +0400 Subject: [PATCH 2/9] style: whitespace and `` can you agree on a code style already? css had 2-space tab so i applied it on html also reduces the size of resulting web page --- www/src/index.md | 6 +++--- www/src/main.css | 17 ++++++++--------- www/src/page-layout.html | 28 ++++++++++++++-------------- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/www/src/index.md b/www/src/index.md index e167c740..b0122c4f 100644 --- a/www/src/index.md +++ b/www/src/index.md @@ -1,5 +1,4 @@ - - + ## Dear [Delta Chat](https://get.delta.chat) users and newcomers ... @@ -18,7 +17,8 @@ without a Delta Chat app, you can also **scan this QR code** with Delta Chat: - + + 🐣 **Choose** your Avatar and Name diff --git a/www/src/main.css b/www/src/main.css index 772b2e9d..d3a8ba62 100644 --- a/www/src/main.css +++ b/www/src/main.css @@ -1,4 +1,3 @@ - body { font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', sans-serif; line-height: 1.4; @@ -74,13 +73,13 @@ code { } .cta-button, .cta-button:hover, .cta-button:visited { - border: 1.5px solid #a4c2d0; - border-radius: 5px; - padding: 10px; - display: inline-block; - margin: 10px 0; + border: 1.5px solid #a4c2d0; + border-radius: 5px; + padding: 10px; + display: inline-block; + margin: 10px 0; - background: linear-gradient(120deg, #77888f, #364e59); - color: white !important; - font-weight: bold; + background: linear-gradient(120deg, #77888f, #364e59); + color: white !important; + font-weight: bold; } diff --git a/www/src/page-layout.html b/www/src/page-layout.html index 28ffde56..45ea708c 100644 --- a/www/src/page-layout.html +++ b/www/src/page-layout.html @@ -1,24 +1,24 @@ - - {% if config.webdev %} - - {% endif %} - - {{ config.mail_domain }} {{ pagename }} - - - + + {% if config.webdev %} + + {% endif %} + + {{ config.mail_domain }} {{ pagename }} + + + {{ markdown_html }} From 41c39bbcf3b01fdd4ab2ee2d2fc2202d630ea066 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Thu, 3 Jul 2025 13:02:46 +0400 Subject: [PATCH 3/9] style: inconsistent newlines in markdown --- www/src/info.md | 1 - www/src/privacy.md | 13 ++++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/www/src/info.md b/www/src/info.md index 1fd7eb5e..bce45a9c 100644 --- a/www/src/info.md +++ b/www/src/info.md @@ -1,4 +1,3 @@ - ## More information {{ config.mail_domain }} provides a low-maintenance, resource efficient and diff --git a/www/src/privacy.md b/www/src/privacy.md index a6626960..0f259c93 100644 --- a/www/src/privacy.md +++ b/www/src/privacy.md @@ -1,4 +1,3 @@ - # Privacy Policy for {{ config.mail_domain }} {% if config.mail_domain == "nine.testrun.org" %} @@ -40,7 +39,6 @@ Nevertheless, we provide legal details below to make life easier for data protection specialists and lawyers scrutinizing chatmail operations. - ## 1. Name and contact information Responsible for the processing of your personal data is: @@ -51,11 +49,11 @@ Responsible for the processing of your personal data is: E-mail: {{ config.privacy_mail }} We have appointed a data protection officer: - ``` {{ config.privacy_pdo }} ``` + ## 2. Processing when using chat e-mail services We provide services optimized for the use from [Delta Chat](https://delta.chat) apps @@ -108,6 +106,7 @@ Art. 6 (1) lit. b GDPR, as you have a usage contract with us by using our services. + ### 2.2 Processing of E-Mail-Messages In addition, @@ -206,6 +205,7 @@ from the aforementioned purposes of data collection. We will not use the collected data for the purpose of drawing conclusions about your person. + ## 4. Transfer of Data We do not retain any personal data but e-mail messages waiting to be delivered @@ -239,6 +239,7 @@ among other things, to implement appropriate security measures and grants us comprehensive control powers. + ## 5. Rights of the data subject The rights arise from Articles 12 to 23 GDPR. @@ -249,8 +250,8 @@ on these or possible objections. A deletion can be made directly in the Delta Chat email messenger. -If you have any questions or complaints, -please feel free to contact us by email: +If you have any questions or complaints, +please feel free to contact us by email: {{ config.privacy_mail }} As a rule, you can contact the supervisory authority of your usual place of residence @@ -267,5 +268,3 @@ as of *October 2024*. Due to the further development of our service and offers or due to changed legal or official requirements, it may become necessary to revise this data protection declaration from time to time. - - From 93fcd37ae587bf7ebfce65e606a2a16e373ef7f1 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Thu, 3 Jul 2025 13:17:15 +0400 Subject: [PATCH 4/9] feat: center button and qrcode --- www/src/index.md | 8 +++++--- www/src/main.css | 9 +++++++-- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/www/src/index.md b/www/src/index.md index b0122c4f..79f85635 100644 --- a/www/src/index.md +++ b/www/src/index.md @@ -10,14 +10,16 @@ for Delta Chat users. For details how it avoids storing personal information please see our [privacy policy](privacy.html). {% endif %} -Get a {{config.mail_domain}} chat profile + + Get a {{config.mail_domain}} chat profile + If you are viewing this page on a different device without a Delta Chat app, you can also **scan this QR code** with Delta Chat: - - + + 🐣 **Choose** your Avatar and Name diff --git a/www/src/main.css b/www/src/main.css index d3a8ba62..26f69580 100644 --- a/www/src/main.css +++ b/www/src/main.css @@ -72,12 +72,17 @@ code { font-weight: bold; } +.link-centered { + display: block; + width: fit-content; + margin: 0 auto; + text-align: center; +} + .cta-button, .cta-button:hover, .cta-button:visited { border: 1.5px solid #a4c2d0; border-radius: 5px; padding: 10px; - display: inline-block; - margin: 10px 0; background: linear-gradient(120deg, #77888f, #364e59); color: white !important; From 2e8318647a515b94fb42231d9bb6f57ffcc0e071 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Thu, 3 Jul 2025 14:05:31 +0400 Subject: [PATCH 5/9] feat: remove button border, adjust padding horizontal padding should not be equal to vertical without border it looks cleaner, but feel free to ask to return it --- www/src/main.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/www/src/main.css b/www/src/main.css index 26f69580..0bf6cc63 100644 --- a/www/src/main.css +++ b/www/src/main.css @@ -80,9 +80,8 @@ code { } .cta-button, .cta-button:hover, .cta-button:visited { - border: 1.5px solid #a4c2d0; - border-radius: 5px; - padding: 10px; + border-radius: 10px; + padding: 10px 20px; background: linear-gradient(120deg, #77888f, #364e59); color: white !important; From 90a6ec0ea06904c272485f2024173feb4383d76f Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Thu, 3 Jul 2025 14:25:17 +0400 Subject: [PATCH 6/9] fix: typography, px->rem, paddings --- www/src/main.css | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/www/src/main.css b/www/src/main.css index 0bf6cc63..79498b1c 100644 --- a/www/src/main.css +++ b/www/src/main.css @@ -1,24 +1,27 @@ +:root { + font-size: 1.25rem; +} + body { + margin: 1rem auto; + padding: 0 0.5rem; + max-width: 40rem; + font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue', 'Segoe UI Emoji', 'Apple Color Emoji', 'Noto Color Emoji', sans-serif; line-height: 1.4; - font-size: 1.2em; - max-width: 800px; - margin: 20px auto; - padding: 0 10px; + color: #363636; background: #fff; } h1 { - font-size: 2.2em; - margin-top: 0; + font-size: 2.2rem; } h1, h2, h3, h4, h5, h6 { color: #000; - margin-bottom: 12px; - margin-top: 24px; font-weight: 600; + margin: 1rem 0; } a { @@ -37,8 +40,8 @@ img, video { code { background: #efefef; - padding: 2.5px 5px; - border-radius: 6px; + padding: 0.1rem 0.25rem; + border-radius: 0.25rem; } #menu { @@ -49,14 +52,15 @@ code { #menu li { display: inline-block; - padding-right: 0.5em; + padding-right: 0.85rem; } -#domain { +li#domain { margin-left: auto; + padding-right: 0; } -#domain a { +li#domain a { color: #888; } @@ -65,9 +69,10 @@ code { } .experimental { - margin: 3em 0; - padding: 1em; - border: 4px dashed red; + margin-top: 2rem; + padding: 1rem; + border: 0.2rem dashed red; + color: red; font-weight: bold; } @@ -80,10 +85,10 @@ code { } .cta-button, .cta-button:hover, .cta-button:visited { - border-radius: 10px; - padding: 10px 20px; + border-radius: 0.4rem; + padding: 0.5rem 0.9rem; background: linear-gradient(120deg, #77888f, #364e59); - color: white !important; + color: #fff; font-weight: bold; } From 10623c5dec108fc8d356b46478f4ba7e3c035b65 Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Fri, 4 Jul 2025 14:22:51 +0400 Subject: [PATCH 7/9] revert: feat: remove button border, adjust padding --- www/src/main.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/www/src/main.css b/www/src/main.css index 79498b1c..6b966acf 100644 --- a/www/src/main.css +++ b/www/src/main.css @@ -85,8 +85,9 @@ li#domain a { } .cta-button, .cta-button:hover, .cta-button:visited { - border-radius: 0.4rem; - padding: 0.5rem 0.9rem; + border: 0.05rem solid #a4c2d0; + border-radius: 0.25rem; + padding: 0.5rem; background: linear-gradient(120deg, #77888f, #364e59); color: #fff; From 2bce90a2d4b8ac07fe9f0866ee94d582156fb7df Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Tue, 8 Jul 2025 11:59:03 +0400 Subject: [PATCH 8/9] revert: style: inconsistent newlines in markdown This reverts commit 41c39bbcf3b01fdd4ab2ee2d2fc2202d630ea066. --- www/src/info.md | 1 + www/src/privacy.md | 13 +++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/www/src/info.md b/www/src/info.md index bce45a9c..1fd7eb5e 100644 --- a/www/src/info.md +++ b/www/src/info.md @@ -1,3 +1,4 @@ + ## More information {{ config.mail_domain }} provides a low-maintenance, resource efficient and diff --git a/www/src/privacy.md b/www/src/privacy.md index 0f259c93..a6626960 100644 --- a/www/src/privacy.md +++ b/www/src/privacy.md @@ -1,3 +1,4 @@ + # Privacy Policy for {{ config.mail_domain }} {% if config.mail_domain == "nine.testrun.org" %} @@ -39,6 +40,7 @@ Nevertheless, we provide legal details below to make life easier for data protection specialists and lawyers scrutinizing chatmail operations. + ## 1. Name and contact information Responsible for the processing of your personal data is: @@ -49,11 +51,11 @@ Responsible for the processing of your personal data is: E-mail: {{ config.privacy_mail }} We have appointed a data protection officer: + ``` {{ config.privacy_pdo }} ``` - ## 2. Processing when using chat e-mail services We provide services optimized for the use from [Delta Chat](https://delta.chat) apps @@ -106,7 +108,6 @@ Art. 6 (1) lit. b GDPR, as you have a usage contract with us by using our services. - ### 2.2 Processing of E-Mail-Messages In addition, @@ -205,7 +206,6 @@ from the aforementioned purposes of data collection. We will not use the collected data for the purpose of drawing conclusions about your person. - ## 4. Transfer of Data We do not retain any personal data but e-mail messages waiting to be delivered @@ -239,7 +239,6 @@ among other things, to implement appropriate security measures and grants us comprehensive control powers. - ## 5. Rights of the data subject The rights arise from Articles 12 to 23 GDPR. @@ -250,8 +249,8 @@ on these or possible objections. A deletion can be made directly in the Delta Chat email messenger. -If you have any questions or complaints, -please feel free to contact us by email: +If you have any questions or complaints, +please feel free to contact us by email: {{ config.privacy_mail }} As a rule, you can contact the supervisory authority of your usual place of residence @@ -268,3 +267,5 @@ as of *October 2024*. Due to the further development of our service and offers or due to changed legal or official requirements, it may become necessary to revise this data protection declaration from time to time. + + From e2cf0e7d895059e10ec5da22f2c592fa6af6ec3f Mon Sep 17 00:00:00 2001 From: DarkCat09 Date: Tue, 8 Jul 2025 12:02:19 +0400 Subject: [PATCH 9/9] revert: style: whitespace and `` This reverts commit 79c4e85eeaeefdedb4a5aa2064554b60b4d2863f. --- www/src/index.md | 3 ++- www/src/page-layout.html | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 15 deletions(-) diff --git a/www/src/index.md b/www/src/index.md index 79f85635..3e9a2ddc 100644 --- a/www/src/index.md +++ b/www/src/index.md @@ -1,4 +1,5 @@ - + + ## Dear [Delta Chat](https://get.delta.chat) users and newcomers ... diff --git a/www/src/page-layout.html b/www/src/page-layout.html index 45ea708c..28ffde56 100644 --- a/www/src/page-layout.html +++ b/www/src/page-layout.html @@ -1,24 +1,24 @@ - - {% if config.webdev %} - - {% endif %} - - {{ config.mail_domain }} {{ pagename }} - - - + + {% if config.webdev %} + + {% endif %} + + {{ config.mail_domain }} {{ pagename }} + + + {{ markdown_html }}