Skip to content

Commit 50d2eaa

Browse files
overheadhunteroverheadhunter
committed
Merge branch 'develop' into tailwind4
# Conflicts: # content/presskit/06-screenshots.de.md # content/presskit/06-screenshots.en.md # layouts/_default/baseof.html
2 parents 89c2df0 + 3050ecd commit 50d2eaa

31 files changed

+34
-57
lines changed

‎.github/workflows/gh-pages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
npm config set "@skymatic:registry" https://npm.pkg.github.com/
2828
npm ci --ignore-scripts
2929
env:
30-
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30+
NODE_AUTH_TOKEN: ${{ secrets.FONTAWESOME_AUTH_TOKEN }}
3131
- name: Build
3232
run: hugo
3333
- name: Upload artifact
@@ -50,4 +50,4 @@ jobs:
5050
uses: actions/deploy-pages@v4 # or specific "vX.X.X" version tag for this action
5151
environment: # Deploy to the github-pages environment
5252
name: github-pages
53-
url: ${{ steps.deployment.outputs.page_url }}
53+
url: ${{ steps.deployment.outputs.page_url }}

‎.nojekyll

Whitespace-only changes.

‎CNAME

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@
88
## Building
99
1. `npm install`
1010
1. run hugo
11-
* for production simply run `hugo`
12-
* for local development run `HUGO_ENV=development hugo server`
11+
* for production builds simply run `npm run build`
12+
* for local development run `npm run dev`
13+
* for local production tests `npm run serve`

‎content/presskit/06-screenshots.de.md

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,26 @@ weight: 6
2525
<div class="flex flex-wrap -mx-3">
2626
<div class="w-full px-3 lg:w-1/2">
2727
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
28-
<a href="/presskit/mac-screenshot-1.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-1.png" alt="Hinzufügen eines Tresors"/></a>
29-
<figcaption>Hinzufügen eines Tresors • 1374x1140 • PNG</figcaption>
30-
</figure>
31-
</div>
32-
<div class="w-full px-3 lg:w-1/2">
33-
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
34-
<a href="/presskit/mac-screenshot-2.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-2.png" alt="Hinzufügen eines Tresors (Dunkel-Modus)"/></a>
35-
<figcaption>Hinzufügen eines Tresors (Dunkel-Modus) • 1374x1140 • PNG</figcaption>
36-
</figure>
37-
</div>
38-
<div class="w-full px-3 lg:w-1/2">
39-
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
40-
<a href="/presskit/mac-screenshot-3.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-3.png" alt="Entsperren des Tresors"/></a>
28+
<a href="/presskit/mac-screenshot-1.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-1.png" alt="Entsperren des Tresors"/></a>
4129
<figcaption>Entsperren des Tresors • 1374x1056 • PNG</figcaption>
4230
</figure>
4331
</div>
4432
<div class="w-full px-3 lg:w-1/2">
4533
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
46-
<a href="/presskit/mac-screenshot-4.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-4.png" alt="Entsperren des Tresors (Dunkel-Modus)"/></a>
34+
<a href="/presskit/mac-screenshot-2.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-2.png" alt="Entsperren des Tresors (Dunkel-Modus)"/></a>
4735
<figcaption>Entsperren des Tresors (Dunkel-Modus) • 1374x1056 • PNG</figcaption>
4836
</figure>
4937
</div>
5038
<div class="w-full px-3 lg:w-1/2">
5139
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
52-
<a href="/presskit/mac-screenshot-5.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-5.png" alt="Entschlüsselter Zugriff über das Tresor-Laufwerk"/></a>
53-
<figcaption>Entschlüsselter Zugriff über das Tresor-Laufwerk • 1742x1154 • PNG</figcaption>
40+
<a href="/presskit/mac-screenshot-3.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-3.png" alt="Entschlüsselter Zugriff über das Tresor-Laufwerk"/></a>
41+
<figcaption>Entschlüsselter Zugriff über das Tresor-Laufwerk • 1992 × 1250 • PNG</figcaption>
5442
</figure>
5543
</div>
5644
<div class="w-full px-3 lg:w-1/2">
5745
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
58-
<a href="/presskit/mac-screenshot-6.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-6.png" alt="Verschlüsselte Dateien liegen im Zielort"/></a>
59-
<figcaption>Verschlüsselte Dateien liegen im Zielort • 1742x1154 • PNG</figcaption>
46+
<a href="/presskit/mac-screenshot-4.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-4.png" alt="Verschlüsselte Dateien liegen im Zielort"/></a>
47+
<figcaption>Verschlüsselte Dateien liegen im Zielort • 1992 × 1250 • PNG</figcaption>
6048
</figure>
6149
</div>
6250
</div>

‎content/presskit/06-screenshots.en.md

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,38 +25,26 @@ weight: 6
2525
<div class="flex flex-wrap -mx-3">
2626
<div class="w-full px-3 lg:w-1/2">
2727
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
28-
<a href="/presskit/mac-screenshot-1.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-1.png" alt="Add vault"/></a>
29-
<figcaption>Add vault • 1374x1140 • PNG</figcaption>
30-
</figure>
31-
</div>
32-
<div class="w-full px-3 lg:w-1/2">
33-
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
34-
<a href="/presskit/mac-screenshot-2.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-2.png" alt="Add vault (Dark Mode)"/></a>
35-
<figcaption>Add vault (Dark Mode) • 1374x1140 • PNG</figcaption>
36-
</figure>
37-
</div>
38-
<div class="w-full px-3 lg:w-1/2">
39-
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
40-
<a href="/presskit/mac-screenshot-3.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-3.png" alt="Unlock vault"/></a>
28+
<a href="/presskit/mac-screenshot-1.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-1.png" alt="Unlock vault"/></a>
4129
<figcaption>Unlock vault • 1374x1056 • PNG</figcaption>
4230
</figure>
4331
</div>
4432
<div class="w-full px-3 lg:w-1/2">
4533
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
46-
<a href="/presskit/mac-screenshot-4.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-4.png" alt="Unlock vault (Dark Mode)"/></a>
34+
<a href="/presskit/mac-screenshot-2.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-2.png" alt="Unlock vault (Dark Mode)"/></a>
4735
<figcaption>Unlock vault (Dark Mode) • 1374x1056 • PNG</figcaption>
4836
</figure>
4937
</div>
5038
<div class="w-full px-3 lg:w-1/2">
5139
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
52-
<a href="/presskit/mac-screenshot-5.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-5.png" alt="Cleartext access via vault drive"/></a>
53-
<figcaption>Cleartext access via vault drive • 1742x1154 • PNG</figcaption>
40+
<a href="/presskit/mac-screenshot-3.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-3.png" alt="Cleartext access via vault drive"/></a>
41+
<figcaption>Cleartext access via vault drive • 1992 × 1250 • PNG</figcaption>
5442
</figure>
5543
</div>
5644
<div class="w-full px-3 lg:w-1/2">
5745
<figure class="rounded-sm shadow-sm bg-white text-center p-2">
58-
<a href="/presskit/mac-screenshot-6.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-6.png" alt="Encrypted files in target location"/></a>
59-
<figcaption>Encrypted files in target location • 1742x1154 • PNG</figcaption>
46+
<a href="/presskit/mac-screenshot-4.png"><img class="inline-block m-remover lazyload" data-src="/presskit/mac-screenshot-4.png" alt="Encrypted files in target location"/></a>
47+
<figcaption>Encrypted files in target location • 1992 × 1250 • PNG</figcaption>
6048
</figure>
6149
</div>
6250
</div>

‎layouts/404.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h1>Sorry, the page you were looking for was not found.</h1>
1212
</div>
1313
{{ end }}
1414
{{ define "script" }}
15-
{{ if hugo.IsServer }}
15+
{{ if hugo.IsDevelopment }}
1616
{{ $404Js := resources.Get "js/404.js" }}
1717
<script type="text/javascript" src="{{ $404Js.RelPermalink }}" defer></script>
1818
{{ else }}

‎layouts/_default/baseof.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
<meta property="og:locale:alternate" content="{{ .Language.Params.LanguageCode }}" />
5252
{{ end }}
5353
<meta name="apple-itunes-app" content="app-id=1560822163">
54-
{{ if hugo.IsServer }}
54+
{{ if hugo.IsDevelopment }}
5555
{{ $css := resources.Get "css/main.css" | css.TailwindCSS }}
5656
<link rel="stylesheet" href="{{ $css.RelPermalink }}" media="screen" />
5757
{{ else }}
@@ -77,7 +77,7 @@
7777
{{ end }}
7878
</div>
7979
{{ partial "footer.html" . }}
80-
{{ if hugo.IsServer }}
80+
{{ if hugo.IsDevelopment }}
8181
<script data-domain="cryptomator.local" src="https://plausible.skymatic.de/js/script.file-downloads.hash.outbound-links.tagged-events.local.js" integrity="sha384-eSdyNyMq4w2Hzeb7A3pkbi2+zvI/skXuKlWsX5uzccigZEHDhHyBYoTASuSW+ZUQ" crossorigin="anonymous" defer></script>
8282
{{ $baseJs := resources.Get "js/base.js" }}
8383
<script type="text/javascript" src="{{ $baseJs.RelPermalink }}" defer></script>

‎layouts/android/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h3 id="keyrecovery" class="font-headline text-xl md:text-2xl leading-relaxed mb
4747
</section>
4848
{{ end }}
4949
{{ define "script" }}
50-
{{ if hugo.IsServer }}
50+
{{ if hugo.IsDevelopment }}
5151
{{ $storeJs := resources.Get "js/store.js" }}
5252
<script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
5353
{{ $keyRecoveryJs := resources.Get "js/keyrecovery.js" }}

‎layouts/blog/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ <h1><a href="{{ .Parent.RelPermalink }}">{{ .Parent.Title }}</a> / {{ .Title }}<
5757
{{ end }}
5858
{{ end }}
5959
{{ if gt (len $discourseEmbedUrl) 0 }}
60-
{{ if hugo.IsServer }}
60+
{{ if hugo.IsDevelopment }}
6161
{{ $discourseJs := resources.Get "js/discourse.js" }}
6262
<script type="text/javascript" src="{{ $discourseJs.RelPermalink }}" x-url="{{ $discourseEmbedUrl }}" defer></script>
6363
{{ else }}

‎layouts/donate/list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">{{ i18n "dona
6969
</section>
7070
{{ end }}
7171
{{ define "script" }}
72-
{{ if hugo.IsServer }}
72+
{{ if hugo.IsDevelopment }}
7373
{{ $customerPortalJs := resources.Get "js/customerportal.js" }}
7474
<script type="text/javascript" src="{{ $customerPortalJs.RelPermalink }}" defer></script>
7575
{{ $recaptchaJs := resources.Get "js/recaptcha.js" }}

‎layouts/downloads/list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ <h2 id="faq" class="font-headline font-medium text-xl md:text-2xl leading-snug m
5252
</section>
5353
{{ end }}
5454
{{ define "script" }}
55-
{{ if hugo.IsServer }}
55+
{{ if hugo.IsDevelopment }}
5656
{{ $downloadJs := resources.Get "js/download.js" }}
5757
<script type="text/javascript" src="{{ $downloadJs.RelPermalink }}" defer></script>
5858
{{ else }}

‎layouts/hub-billing/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ <h3 class="font-headline text-xl md:text-2xl leading-relaxed mb-4">
450450
</div>
451451
{{ end }}
452452
{{ define "script" }}
453-
{{ if hugo.IsServer }}
453+
{{ if hugo.IsDevelopment }}
454454
{{ $storeJs := resources.Get "js/store.js" }}
455455
<script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
456456
{{ $hubSubscriptionJs := resources.Get "js/hubsubscription.js" }}

‎layouts/hub-demo/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ <h2 class="font-headline font-medium text-xl md:text-2xl leading-snug mb-4">{{ i
7878
</section>
7979
{{ end }}
8080
{{ define "script" }}
81-
{{ if hugo.IsServer }}
81+
{{ if hugo.IsDevelopment }}
8282
{{ $storeJs := resources.Get "js/store.js" }}
8383
<script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
8484
{{ $hubDemoJs := resources.Get "js/hubdemo.js" }}

‎layouts/hub-managed/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ <h2 class="font-headline font-medium text-xl md:text-2xl leading-snug mb-4">{{ i
106106
</section>
107107
{{ end }}
108108
{{ define "script" }}
109-
{{ if hugo.IsServer }}
109+
{{ if hugo.IsDevelopment }}
110110
{{ $storeJs := resources.Get "js/store.js" }}
111111
<script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
112112
{{ $hubManagedJs := resources.Get "js/hubmanaged.js" }}

‎layouts/hub-self-hosted/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ <h2 class="font-headline font-medium text-xl md:text-2xl leading-snug mb-4">{{ i
318318
{{ define "script" }}
319319
{{ $jsYaml := resources.Get "js/js-yaml/js-yaml.min.js" | fingerprint }}
320320
<script type="text/javascript" src="{{ $jsYaml.RelPermalink }}" integrity="{{ $jsYaml.Data.Integrity }}"></script>
321-
{{ if hugo.IsServer }}
321+
{{ if hugo.IsDevelopment }}
322322
{{ $setupJs := resources.Get "js/hubsetup.js" }}
323323
<script type="text/javascript" src="{{ $setupJs.RelPermalink }}" defer></script>
324324
{{ else }}

‎layouts/hub/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ <h2 id="newsletter" class="font-headline font-medium text-xl md:text-2xl leading
128128
</section>
129129
{{ end }}
130130
{{ define "script" }}
131-
{{ if hugo.IsServer }}
131+
{{ if hugo.IsDevelopment }}
132132
{{ $newsletterJs := resources.Get "js/newsletter.js" }}
133133
<script type="text/javascript" src="{{ $newsletterJs.RelPermalink }}" defer></script>
134134
{{ else }}

‎layouts/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ <h2 class="font-headline font-medium text-xl md:text-2xl leading-snug mb-1">{{ i
229229
</div>
230230
{{ end }}
231231
{{ define "script" }}
232-
{{ if hugo.IsServer }}
232+
{{ if hugo.IsDevelopment }}
233233
{{ $indexJs := resources.Get "js/index.js" }}
234234
<script type="text/javascript" src="{{ $indexJs.RelPermalink }}" defer></script>
235235
{{ $newsletterJs := resources.Get "js/newsletter.js" }}

‎layouts/pricing/single.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ <h2 class="font-headline font-medium text-xl md:text-2xl leading-snug mb-4">{{ i
409409
</div>
410410
{{ end }}
411411
{{ define "script" }}
412-
{{ if hugo.IsServer }}
412+
{{ if hugo.IsDevelopment }}
413413
{{ $storeJs := resources.Get "js/store.js" }}
414414
<script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
415415
{{ $hubPricingJs := resources.Get "js/hubpricing.js" }}

‎layouts/supporter-cert/list.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ <h2 id="faq" class="font-headline font-medium text-xl md:text-2xl leading-snug m
8686
</section>
8787
{{ end }}
8888
{{ define "script" }}
89-
{{ if hugo.IsServer }}
89+
{{ if hugo.IsDevelopment }}
9090
{{ $storeJs := resources.Get "js/store.js" }}
9191
<script type="text/javascript" src="{{ $storeJs.RelPermalink }}" defer></script>
9292
{{ $desktopKeyJs := resources.Get "js/desktopkey.js" }}

‎package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@
66
"scripts": {
77
"clean": "rm -r public",
88
"build": "hugo",
9-
"serve": "hugo server",
9+
"dev": "hugo server --environment=development",
10+
"serve": "hugo server --environment=production",
1011
"test": "echo \"Error: no test specified\" && exit 1"
1112
},
1213
"author": "Sebastian Stenzel",

‎static/presskit/linux-screenshot-1.png

161 KB
Loading

‎static/presskit/linux-screenshot-2.png

492 KB
Loading

‎static/presskit/mac-screenshot-1.png

-58.5 KB
Loading

‎static/presskit/mac-screenshot-2.png

193 KB
Loading

‎static/presskit/mac-screenshot-3.png

196 KB
Loading

‎static/presskit/mac-screenshot-4.png

129 KB
Loading

‎static/presskit/mac-screenshot-5.png

-207 KB
Binary file not shown.

‎static/presskit/mac-screenshot-6.png

-212 KB
Binary file not shown.

‎static/presskit/win-screenshot-1.png

130 KB
Loading

‎static/presskit/win-screenshot-2.png

370 KB
Loading

0 commit comments

Comments
 (0)