Skip to content

Commit 0924bcb

Browse files
committed
Merge branch 'develop'
2 parents 4c3e228 + 473dd38 commit 0924bcb

File tree

4 files changed

+20
-30
lines changed

4 files changed

+20
-30
lines changed

i18n/de.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,8 @@
445445

446446
- id: hub_deployment_title
447447
translation: "Bereit, mit Cryptomator Hub zu starten?"
448+
- id: hub_deployment_recommended
449+
translation: "Empfohlen"
448450
- id: hub_deployment_managed_subtitle
449451
translation: "Von Skymatic gehostet und gewartet"
450452
- id: hub_deployment_managed_benefit_1
@@ -917,7 +919,7 @@
917919
- id: pricing_hub_managed_title
918920
translation: "Managed"
919921
- id: pricing_hub_managed_cta
920-
translation: "Jetzt anmelden"
922+
translation: "Kostenlose 30-Tage-Testversion starten"
921923

922924
- id: pricing_hub_community_title
923925
translation: "Community"
@@ -940,8 +942,6 @@
940942
translation: "Standard"
941943
- id: pricing_hub_standard_price_description
942944
translation: "pro Sitz, pro Monat"
943-
- id: pricing_hub_standard_trial
944-
translation: "30 Tage kostenlos"
945945
- id: pricing_hub_standard_benefit_1
946946
translation: "Alles in Community"
947947
- id: pricing_hub_standard_benefit_2

i18n/en.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -445,6 +445,8 @@
445445

446446
- id: hub_deployment_title
447447
translation: "Ready to Get Started with Cryptomator Hub?"
448+
- id: hub_deployment_recommended
449+
translation: "Recommended"
448450
- id: hub_deployment_managed_subtitle
449451
translation: "Hosted and maintained by Skymatic"
450452
- id: hub_deployment_managed_benefit_1
@@ -917,7 +919,7 @@
917919
- id: pricing_hub_managed_title
918920
translation: "Managed"
919921
- id: pricing_hub_managed_cta
920-
translation: "Sign Up Now"
922+
translation: "Start Free 30-Day Trial"
921923

922924
- id: pricing_hub_community_title
923925
translation: "Community"
@@ -940,8 +942,6 @@
940942
translation: "Standard"
941943
- id: pricing_hub_standard_price_description
942944
translation: "per seat, per month"
943-
- id: pricing_hub_standard_trial
944-
translation: "Free 30-Day Trial"
945945
- id: pricing_hub_standard_benefit_1
946946
translation: "Everything in Community"
947947
- id: pricing_hub_standard_benefit_2

layouts/for-teams/single.html

Lines changed: 9 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -172,17 +172,14 @@ <h2 id="pricing-plans" class="font-h2 mb-4">{{ i18n "hub_pricing_title" . }}</h2
172172
<h2 id="deployment" class="text-center font-h2 mb-4">{{ i18n "hub_deployment_title" . }}</h2>
173173

174174
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
175-
<div class="flex flex-col white-box">
175+
<div class="flex flex-col white-box ring-2 ring-secondary">
176176
<div class="flex justify-between items-center p-4 border-b border-primary">
177-
<h3>
178-
<div class="flex items-center">
179-
<img src="/img/logo.svg" class="hidden md:block h-8 mr-2 aspect-1110/942" alt="Logo"/>
180-
<span class="font-headline font-bold text-primary pb-px">CRYPTOMATOR HUB</span>
181-
</div>
177+
<h3 class="font-h3">
178+
<i class="fa-solid fa-cloud text-primary"></i> {{ i18n "pricing_hub_managed_title" . }}
182179
</h3>
183-
<div class="inline-flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium tracking-wide uppercase bg-primary-l2 text-dark">
184-
<i class="fa-solid fa-cloud"></i>
185-
{{ i18n "pricing_hub_managed_title" . }}
180+
<div class="inline-flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium tracking-wide uppercase bg-secondary text-white">
181+
<i class="fa-solid fa-star"></i>
182+
{{ i18n "hub_deployment_recommended" . }}
186183
</div>
187184
</div>
188185
<div class="flex flex-col justify-between h-full gap-8 px-4 py-8">
@@ -212,17 +209,10 @@ <h4 class="font-medium lg:text-lg leading-relaxed">
212209
</div>
213210

214211
<div class="flex flex-col white-box">
215-
<div class="flex justify-between items-center p-4 border-b border-primary">
216-
<h3>
217-
<div class="flex items-center">
218-
<img src="/img/logo.svg" class="hidden md:block h-8 mr-2 aspect-1110/942" alt="Logo"/>
219-
<span class="font-headline font-bold text-primary pb-px">CRYPTOMATOR HUB</span>
220-
</div>
212+
<div class="p-4 border-b border-primary">
213+
<h3 class="font-h3">
214+
<i class="fa-solid fa-server text-primary"></i> {{ i18n "pricing_hub_self_hosted_title" . }}
221215
</h3>
222-
<div class="inline-flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium tracking-wide uppercase bg-primary-l2 text-dark">
223-
<i class="fa-solid fa-server"></i>
224-
{{ i18n "pricing_hub_self_hosted_title" . }}
225-
</div>
226216
</div>
227217
<div class="flex flex-col justify-between h-full gap-8 px-4 py-8">
228218
<div class="flex flex-col gap-4">

layouts/pricing/single.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ <h1 class="font-h1 mb-8">{{ .Title }}</h1>
55
<p class="lead">{{ .Description }}</p>
66
</header>
77

8-
<div x-data="{planOption: location.hash}" x-init="location.hash = planOption || '#for-individuals'" @hashchange.window="planOption = location.hash" class="py-12">
8+
<div x-data="{planOption: location.hash}" x-init="location.hash = planOption || '#for-teams'" @hashchange.window="planOption = location.hash" class="py-12">
99
<header class="text-center">
1010
<h2 class="text-center font-h2 mb-4">
1111
{{ i18n "pricing_title" . }}
@@ -262,15 +262,15 @@ <h3 class="inline-flex px-4 py-1 rounded-full text-xs lg:text-sm font-medium tra
262262
</ul>
263263
</div>
264264
</div>
265-
<div x-data="{infrastructure: 'managed', data: {selfHostedMonthlyPrice: null, managedMonthlyPrice: null}}" x-init="new HubPricing(data).loadPrice()" class="white-box">
265+
<div x-data="{infrastructure: 'managed', data: {selfHostedMonthlyPrice: null, managedMonthlyPrice: null}}" x-init="new HubPricing(data).loadPrice()" class="white-box" :class="infrastructure === 'managed' && 'ring-2 ring-secondary'">
266266
<div class="p-4 border-b border-primary">
267267
<div class="flex gap-2 mb-8">
268268
<h3 class="inline-flex px-4 py-1 rounded-full text-xs lg:text-sm font-medium tracking-wide uppercase bg-primary-l2 text-dark">
269269
{{ i18n "pricing_hub_standard_title" . }}
270270
</h3>
271-
<p class="inline-flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium tracking-wide uppercase bg-gray-300 text-gray-700">
272-
<i class="fa-solid fa-calendar-star"></i>
273-
{{ i18n "pricing_hub_standard_trial" . }}
271+
<p x-show="infrastructure === 'managed'" class="inline-flex items-center gap-x-1.5 px-4 py-1 rounded-full text-xs lg:text-sm font-medium tracking-wide uppercase bg-secondary text-white">
272+
<i class="fa-solid fa-star"></i>
273+
{{ i18n "hub_deployment_recommended" . }}
274274
</p>
275275
</div>
276276
<div class="flex items-center gap-2">

0 commit comments

Comments
 (0)