Merge branch 'develop' into feature/api-migration

overheadhunter · overheadhunter · commit 931c63149d79 · 2025-10-01T12:50:53.000+02:00
# Conflicts:
#	layouts/partials/donate-creditcard.html
diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -69,7 +69,7 @@ jobs:
 
   # DEPLOY STAGING
   deploy-staging:
-    if: github.ref == 'refs/heads/develop'
+    if: github.ref == 'refs/heads/feature/api-migration'
     name: Deploy Staging to GitHub Pages
     runs-on: ubuntu-latest
     needs: [build]
diff --git a/assets/css/custom.css b/assets/css/custom.css
@@ -200,7 +200,7 @@ textarea:read-only {
 [id]::before {
   content: '';
   display: block;
-  height: 138px;
-  margin-top: -138px;
+  height: 96px;
+  margin-top: -96px;
   visibility: hidden;
 }
diff --git a/content/downloads/android.de.html b/content/downloads/android.de.html
@@ -22,10 +22,8 @@ <h3 class="font-h3 text-lg">Google Play</h3>
       <a href="https://play.google.com/store/apps/details?id=org.cryptomator&hl=de" role="button" data-umami-event="downloads-android-googleplay">
         <img class="h-10 mx-auto lazyload" data-src="/de/img/downloads/googleplay-badge.png">
       </a>
-      <p class="text-sm md:text-base leading-relaxed text-gray-700 rounded bg-primary-l2 p-2 mt-4">🍁 Der Einmalpreis ist um 25 %* reduziert!</p>
     </div>
   </div>
-  <p class="prose prose-sm max-w-none">*Hinweis: Die Höhe des Rabatts kann je nach Region variieren.</p>
 
   <div class="white-box my-4">
     <div class="px-4 py-2 border-b border-primary">
diff --git a/content/downloads/android.en.html b/content/downloads/android.en.html
@@ -24,10 +24,8 @@ <h3 class="font-h3 text-lg">Google Play</h3>
       <a href="https://play.google.com/store/apps/details?id=org.cryptomator&hl=en" role="button" data-umami-event="downloads-android-googleplay">
         <img class="h-10 mx-auto lazyload" data-src="/img/downloads/googleplay-badge.png">
       </a>
-      <p class="text-sm md:text-base leading-relaxed text-gray-700 rounded bg-primary-l2 p-2 mt-4">🍁 One-time price is 25%* off!</p>
     </div>
   </div>
-  <p class="prose prose-sm max-w-none">*Note: The discount amount may vary by region.</p>
 
   <div class="white-box my-4">
     <div class="px-4 py-2 border-b border-primary">
diff --git a/content/downloads/ios.de.html b/content/downloads/ios.de.html
@@ -23,8 +23,6 @@ <h3 class="font-h3 text-lg">App Store</h3>
         <img class="h-10 mx-auto mb-4 lazyload" data-src="/de/img/downloads/appstore-badge.svg">
       </a>
       <p class="font-p text-sm">Eine Vollversion ohne In-App-Käufe für Apple School/Business Manager ist <a class="text-link" href="https://apps.apple.com/de/app/cryptomator-full-version/id1665616242">im App Store</a> erhältlich.</p>
-      <p class="text-sm md:text-base leading-relaxed text-gray-700 rounded bg-primary-l2 p-2 mt-4">🍁 Die lebenslange Lizenz ist um 25 %* reduziert!</p>
     </div>
   </div>
-  <p class="prose prose-sm max-w-none">*Hinweis: Die Höhe des Rabatts kann je nach Region variieren.</p>
 </div>
diff --git a/content/downloads/ios.en.html b/content/downloads/ios.en.html
@@ -23,8 +23,6 @@ <h3 class="font-h3 text-lg">App Store</h3>
         <img class="h-10 mx-auto mb-4 lazyload" data-src="/img/downloads/appstore-badge.svg">
       </a>
       <p class="font-p text-sm">A full version without in-app purchases for Apple School/Business Manager is available <a class="text-link" href="https://apps.apple.com/us/app/cryptomator-full-version/id1665616242">on the App Store</a>.</p>
-      <p class="text-sm md:text-base leading-relaxed text-gray-700 rounded bg-primary-l2 p-2 mt-4">🍁 Lifetime license is 25%* off!</p>
     </div>
   </div>
-  <p class="prose prose-sm max-w-none">*Note: The discount amount may vary by region.</p>
 </div>
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
@@ -65,7 +65,7 @@
   </head>
   <body x-data="{ isNavOpen: false, globalData: { githubStargazers: null, mastodonFollowers: null } }" x-init="determineGlobalData('{{ .Site.Language.Lang }}', globalData)" :class="isNavOpen && 'overflow-hidden'" class="bg-dark font-body text-gray-900">
     {{ partial "nav.html" . }}
-    {{- $topPadding := cond .IsHome "" "pt-24 md:pt-18" -}}
+    {{- $topPadding := cond .IsHome "" "pt-12" -}}
     <div class="bg-gray-100 min-h-[80vh] {{ $topPadding }}">
     <!-- Code that all your templates share, like a header -->
     {{ block "main" . }}
diff --git a/layouts/for-individuals/single.html b/layouts/for-individuals/single.html
@@ -13,9 +13,6 @@
             <img src="/img/logo.svg" class="h-8 aspect-1110/942" alt="Logo"/>
             <span class="font-headline font-bold text-primary ml-2 pb-px">CRYPTOMATOR</span>
           </div>
-          <div class="px-4 py-1 rounded-full text-xs lg:text-sm font-medium bg-red-600 text-white">
-            {{ i18n "for_individuals_header_kicker_sale" . }}
-          </div>
         </div>
         <h1 class="font-h1 mb-6">{{ i18n "for_individuals_header_title" . | safeHTML }}</h1>
         <p class="lead mb-6">{{ i18n "for_individuals_header_description" . | safeHTML }}</p>
@@ -25,9 +22,6 @@ <h1 class="font-h1 mb-6">{{ i18n "for_individuals_header_title" . | safeHTML }}<
           </div>
       </div>
       <p class="font-p">{{ i18n "for_individuals_header_cta_description" . | safeHTML }}</p>
-      <p class="text-sm mt-6">
-        * {{ i18n "pricing_discount_note" }}
-      </p>
     </header>
   </section>
 
diff --git a/layouts/for-teams/single.html b/layouts/for-teams/single.html
@@ -14,9 +14,6 @@
             <img src="/img/logo.svg" class="h-8 aspect-1110/942" alt="Logo"/>
             <span class="font-headline font-bold text-primary ml-2 pb-px">CRYPTOMATOR HUB</span>
           </div>
-          <div class="px-4 py-1 rounded-full text-xs lg:text-sm font-medium bg-red-600 text-white">
-            {{ i18n "hub_header_kicker_sale" . }}
-          </div>
         </div>
         <h1 class="font-h1 mb-6">{{ i18n "hub_header_title" . | safeHTML }}</h1>
         <p class="lead mb-6">{{ i18n "hub_header_description" . | safeHTML }}</p>
diff --git a/layouts/hub-billing/single.html b/layouts/hub-billing/single.html
@@ -315,15 +315,6 @@ <h2 class="inline-flex px-4 py-1 rounded-full text-sm font-medium tracking-wide
                   {{ i18n "hub_billing_checkout_standard_title" . }}
                 </h2>
                 <div x-show="audience === 'business'">
-                  <p class="flex items-baseline gap-2">
-                    <span x-text="(subscriptionData.monthlyPrice.netAmount * 0.75).toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: subscriptionData.monthlyPrice.currency })" class="font-bold leading-relaxed"></span>
-                    <span class="text-xs text-gray-700">
-                      {{ i18n "pricing_hub_standard_price_first_year" . }}
-                    </span>
-                    <span class="self-center px-1 rounded-xs text-xs text-white bg-red-600">
-                      -25% Autumn Sale
-                    </span>
-                  </p>
                   <p class="flex items-baseline gap-2">
                     <span x-text="subscriptionData.monthlyPrice.netAmount.toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: subscriptionData.monthlyPrice.currency })" class="text-5xl font-bold"></span>
                     <span class="text-gray-700">{{ i18n "pricing_vat_excluded" . }}</span>
@@ -335,15 +326,6 @@ <h2 class="inline-flex px-4 py-1 rounded-full text-sm font-medium tracking-wide
                   </p>
                 </div>
                 <div x-show="audience === 'consumer'">
-                  <p class="flex items-baseline gap-2">
-                    <span x-text="(subscriptionData.monthlyPrice.grossAmount * 0.75).toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: subscriptionData.monthlyPrice.currency })" class="font-bold leading-relaxed"></span>
-                    <span class="text-xs text-gray-700">
-                      {{ i18n "pricing_hub_standard_price_first_year" . }}
-                    </span>
-                    <span class="self-center px-1 rounded-xs text-xs text-white bg-red-600">
-                      -25% Autumn Sale
-                    </span>
-                  </p>
                   <p class="flex items-baseline gap-2">
                     <span x-text="subscriptionData.monthlyPrice.grossAmount.toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: subscriptionData.monthlyPrice.currency })" class="text-5xl font-bold"></span>
                     <span class="text-gray-700">{{ i18n "pricing_vat_included" . }}</span>
@@ -404,7 +386,6 @@ <h2 class="inline-flex px-4 py-1 rounded-full text-sm font-medium tracking-wide
                 <h2 class="inline-flex px-4 py-1 rounded-full text-sm font-medium tracking-wide uppercase bg-primary-l2 text-dark mb-4">
                   {{ i18n "hub_billing_checkout_enterprise_title" . }}
                 </h2>
-                <div class="md:h-[26px]"></div>
                 <p class="text-5xl font-bold">
                   {{ i18n "hub_billing_checkout_enterprise_statement" . }}
                 </p>
diff --git a/layouts/index.html b/layouts/index.html
@@ -12,17 +12,13 @@
 {{ end }}
 {{ define "main" }}
   <section class="flex items-center header-bg bg-dark bg-center min-h-[66vh] bg-repeat-x">
-    <header class="container flex items-center text-white pt-40 pb-24 md:pt-56 md:pb-48 lg:pt-72 lg:pb-64">
+    <header class="container flex items-center text-white py-24 md:py-48 lg:py-64">
       <div class="hidden pr-6 md:block md:w-1/3 lg:w-2/5">
         <img data-src="/img/home/woman-cloud.png" class="lazyload aspect-714/622 w-full object-scale-down mx-auto lg:w-3/4 animate-hover" alt="{{ i18n "home_header_woman_cloud_alt" . }}"/>
       </div>
       <div class="w-full md:w-2/3 lg:w-3/5">
         <div class="flex items-center gap-4 mb-4">
-          <div class="flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium bg-red-600 text-white">
-            <i class="fa-solid fa-leaf-maple"></i>
-            {{ i18n "home_header_kicker_sale" }}
-          </div>
-          <div class="hidden md:flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium bg-transparent border border-primary text-primary">
+          <div class="flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium bg-transparent border border-primary text-primary">
             <i class="fa-solid fa-cloud-download"></i>
             {{ i18n "home_header_kicker" }}
           </div>
@@ -54,9 +50,6 @@ <h1 class="font-h1 mb-6">
             <a href="{{ .Site.LanguagePrefix }}/for-teams/" role="button" class="btn btn-primary text-lg w-full md:w-64" data-umami-event="home-header-teams-cta">{{ i18n "home_header_for_teams_cta" . }}</a>
           </div>
         </div>
-        <p class="text-sm mt-6">
-          * {{ i18n "pricing_discount_note" }}
-        </p>
       </div>
     </header>
   </section>
diff --git a/layouts/partials/donate-creditcard.html b/layouts/partials/donate-creditcard.html
@@ -48,8 +48,8 @@
           {{ i18n "donate_creditcard_once_paynow" }}
         </button>
 
-        {{ $captchaUrl := printf "%s/donations/stripe/payments/challenge" .Site.Params.apiBaseUrl }}
-        {{ partial "captcha.html" (dict "challengeUrl" $captchaUrl "captchaPayload" "oneTimePaymentStatus.captcha" "captchaState" "captchaState") }}
+        {{ $challengeUrl := printf "%s/donations/stripe/payments/challenge" .Site.Params.apiBaseUrl }}
+        {{ partial "captcha.html" (dict "challengeUrl" $challengeUrl "captchaPayload" "oneTimePaymentStatus.captcha" "captchaState" "captchaState") }}
 
         <p class="text-sm text-red-600 mt-2" x-text="oneTimePaymentStatus.errorMessage"></p>
       </div>
diff --git a/layouts/partials/nav.html b/layouts/partials/nav.html
@@ -4,9 +4,6 @@
 {{- $backgroundColor := cond .IsHome "bg-dark" "bg-white" -}}
 {{- $currentRelPermalink := .RelPermalink -}}
 <nav class="w-full max-h-screen {{ $textColor }} fixed {{ $backgroundColor }} shadow-sm z-50">
-  <div class="w-full bg-primary text-center text-sm text-white p-0.5">
-    <p>{{ i18n "nav_promotion" . | emojify }}</p>
-  </div>
   <div class="flex justify-between items-stretch w-full lg:px-8">
     <!-- Regular Navigation -->
     <div class="flex items-stretch">
diff --git a/layouts/pricing/single.html b/layouts/pricing/single.html
@@ -40,7 +40,6 @@ <h2 class="text-center font-h2 mb-4">
                   Linux
                 </div>
               </div>
-              <div class="lg:h-[26px]"></div>
               <p class="font-bold text-2xl md:text-3xl leading-relaxed">
                 {{ i18n "pricing_free" . }}
               </p>
@@ -85,17 +84,9 @@ <h2 class="text-center font-h2 mb-4">
                   Android
                 </div>
               </div>
-              <p class="flex items-center gap-2">
-                <span class="font-bold leading-relaxed text-gray-500 line-through decoration-red-600">
-                  {{ i18n "pricing_android_price" . }}
-                </span>
-                <span class="px-1 rounded-xs text-xs text-white bg-red-600">
-                  25%<sup>1</sup> {{ i18n "sale_off" . }}
-                </span>
-              </p>
               <p class="flex items-baseline gap-2">
                 <span class="font-bold text-2xl md:text-3xl leading-relaxed">
-                  {{ i18n "pricing_android_price_discounted" . }}
+                  {{ i18n "pricing_android_price" . }}
                 </span>
                 <span class="text-xs md:text-sm text-gray-700">
                   {{ i18n "pricing_vat_included" . }}
@@ -139,7 +130,6 @@ <h2 class="text-center font-h2 mb-4">
               </div>
               <div class="grid grid-cols-2 divide-x divide-gray-300 mb-4">
                 <div class="pr-4">
-                  <div class="lg:h-[26px]"></div>
                   <div class="font-bold text-2xl md:text-3xl leading-relaxed">
                     {{ i18n "pricing_free" . }}
                   </div>
@@ -148,17 +138,9 @@ <h2 class="text-center font-h2 mb-4">
                   </p>
                 </div>
                 <div class="pl-4">
-                  <p class="flex items-center gap-2">
-                    <span class="font-bold leading-relaxed text-gray-500 line-through decoration-red-600">
-                      {{ i18n "pricing_ios_price" . }}
-                    </span>
-                    <span class="px-1 rounded-xs text-xs text-white bg-red-600">
-                      25%<sup>1</sup> {{ i18n "sale_off" . }}
-                    </span>
-                  </p>
                   <p class="flex items-baseline gap-2">
                     <span class="font-bold text-2xl md:text-3xl leading-relaxed">
-                      {{ i18n "pricing_ios_price_discounted" . }}
+                      {{ i18n "pricing_ios_price" . }}
                     </span>
                     <span class="text-xs md:text-sm text-gray-700">
                       {{ i18n "pricing_vat_included" . }}
@@ -196,11 +178,6 @@ <h2 class="text-center font-h2 mb-4">
           </div>
         </section>
 
-        <p class="text-sm text-gray-700">
-          <sup>1</sup>
-          <span>{{ i18n "pricing_discount_note" . }}</span>
-        </p>
-
         <section class="container py-12">
           <header class="text-center">
             <h2 class="font-h2 mb-4">{{ i18n "faq_title" . }}</h2>
@@ -246,7 +223,6 @@ <h3 class="inline-flex px-4 py-1 rounded-full text-xs lg:text-sm font-medium tra
               <p class="block uppercase tracking-wide text-gray-700 text-xs font-bold">
                 {{ i18n "pricing_hub_self_hosted_title" . }}
               </p>
-              <div class="lg:h-[34px]"></div>
               <p class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed">
                 {{ i18n "pricing_free" . }}
               </p>
@@ -311,15 +287,6 @@ <h3 class="inline-flex px-4 py-1 rounded-full text-xs lg:text-sm font-medium tra
               </div>
               <div x-show="infrastructure === 'managed'">
                 <p class="flex items-baseline gap-2 mt-2">
-                  <span x-text="data.managedMonthlyPrice ? (data.managedMonthlyPrice.amount * 0.75).toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: data.managedMonthlyPrice.currency }) : '…'" class="font-bold leading-relaxed"></span>
-                  <span class="text-xs text-gray-700">
-                    {{ i18n "pricing_hub_standard_price_first_year" . }}
-                  </span>
-                  <span class="self-center px-1 rounded-xs text-xs text-white bg-red-600">
-                    25% {{ i18n "sale_off" . }}
-                  </span>
-                </p>
-                <p class="flex items-baseline gap-2">
                   <span x-text="data.managedMonthlyPrice ? data.managedMonthlyPrice.amount.toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: data.managedMonthlyPrice.currency }) : '…'" class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed"></span>
                   <span class="text-xs md:text-sm lg:text-base text-gray-700">
                     {{ i18n "pricing_vat_excluded" . }}
@@ -334,15 +301,6 @@ <h3 class="inline-flex px-4 py-1 rounded-full text-xs lg:text-sm font-medium tra
               </div>
               <div x-show="infrastructure === 'self-hosted'">
                 <p class="flex items-baseline gap-2 mt-2">
-                  <span x-text="data.selfHostedMonthlyPrice ? (data.selfHostedMonthlyPrice.amount * 0.75).toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: data.selfHostedMonthlyPrice.currency }) : '…'" class="font-bold leading-relaxed"></span>
-                  <span class="text-xs text-gray-700">
-                    {{ i18n "pricing_hub_standard_price_first_year" . }}
-                  </span>
-                  <span class="self-center px-1 rounded-xs text-xs text-white bg-red-600">
-                    25% {{ i18n "sale_off" . }}
-                  </span>
-                </p>
-                <p class="flex items-baseline gap-2">
                   <span x-text="data.selfHostedMonthlyPrice ? data.selfHostedMonthlyPrice.amount.toLocaleString('{{ .Site.Language.Lang }}', { style: 'currency', currency: data.selfHostedMonthlyPrice.currency }) : '…'" class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed"></span>
                   <span class="text-xs md:text-sm lg:text-base text-gray-700">
                     {{ i18n "pricing_vat_excluded" . }}
@@ -401,7 +359,6 @@ <h3 class="inline-flex px-4 py-1 rounded-full text-xs lg:text-sm font-medium tra
               <p class="block uppercase tracking-wide text-gray-700 text-xs font-bold">
                 {{ i18n "pricing_hub_managed_title" . }} & {{ i18n "pricing_hub_self_hosted_title" . }}
               </p>
-              <div class="lg:h-[34px]"></div>
               <p class="font-bold text-2xl md:text-3xl lg:text-4xl leading-relaxed">
                 {{ i18n "pricing_hub_enterprise_price" . }}
               </p>
