Skip to content

Commit 79b0fb3

Browse files
tobihagemanntobihagemann
committed
Merge branch 'develop'
2 parents cf15441 + 213a1df commit 79b0fb3

File tree

11 files changed

+88
-100
lines changed

11 files changed

+88
-100
lines changed

‎assets/css/custom.css‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ textarea:read-only {
170170
@apply bg-gray-200;
171171
}
172172

173-
.aspect-16x9 {
174-
padding-bottom: 56.25%;
175-
}
176-
177173
.img-muted {
178174
filter: grayscale(100%);
179175
opacity: .5;
@@ -185,14 +181,6 @@ textarea:read-only {
185181
opacity: 1;
186182
}
187183

188-
.bg-trans-white {
189-
background-color: rgba(255, 255, 255, 0.05);
190-
}
191-
192-
.m-remover {
193-
margin: 0 !important;
194-
}
195-
196184
.has-tooltip {
197185
@apply relative inline-block;
198186
}

‎content/blog/2017-07-01-release-1.3.0.de.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ We'd like to highlight some improvements that we were able to make under-the-hoo
174174
### Evolution of Cryptomator
175175
(made with Gource)
176176

177-
<div class="relative aspect-16x9">
177+
<div class="relative aspect-video">
178178
<iframe class="absolute w-full h-full" src="https://gfycat.com/ifr/UnlawfulAdmirableAmericanindianhorse" frameborder="0" scrolling="no" allowfullscreen></iframe>
179179
</div>
180180

‎content/blog/2017-07-01-release-1.3.0.en.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ We'd like to highlight some improvements that we were able to make under-the-hoo
173173
### Evolution of Cryptomator
174174
(made with Gource)
175175

176-
<div class="relative aspect-16x9">
176+
<div class="relative aspect-video">
177177
<iframe class="absolute w-full h-full" src="https://gfycat.com/ifr/UnlawfulAdmirableAmericanindianhorse" frameborder="0" scrolling="no" allowfullscreen></iframe>
178178
</div>
179179

‎content/presskit/01-logos.de.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ weight: 1
66
<div class="flex flex-wrap -mx-3">
77
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
88
<figure class="white-box text-center p-2">
9-
<a href="/presskit/cryptomator-logo.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-logo.png" alt="Cryptomator Logo"/></a>
9+
<a href="/presskit/cryptomator-logo.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-logo.png" alt="Cryptomator Logo"/></a>
1010
<figcaption>Cryptomator Logo • 1024x1024 • PNG</figcaption>
1111
</figure>
1212
</div>
1313
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
1414
<figure class="white-box text-center p-2">
15-
<a href="/presskit/cryptomator-android-icon.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-android-icon.png" alt="Cryptomator für Android App Icon"/></a>
15+
<a href="/presskit/cryptomator-android-icon.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-android-icon.png" alt="Cryptomator für Android App Icon"/></a>
1616
<figcaption>Cryptomator für Android App Icon • 1024x1024 • PNG</figcaption>
1717
</figure>
1818
</div>
1919
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
2020
<figure class="white-box text-center p-2">
21-
<a href="/presskit/cryptomator-ios-icon.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-ios-icon.png" alt="Cryptomator für iOS App Icon"/></a>
21+
<a href="/presskit/cryptomator-ios-icon.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-ios-icon.png" alt="Cryptomator für iOS App Icon"/></a>
2222
<figcaption>Cryptomator für iOS App Icon • 1024x1024 • PNG</figcaption>
2323
</figure>
2424
</div>
2525
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
2626
<figure class="white-box text-center p-2">
27-
<a href="/presskit/cryptomator-logo.svg"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-logo.svg" alt="Cryptomator Logo"/></a>
27+
<a href="/presskit/cryptomator-logo.svg"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-logo.svg" alt="Cryptomator Logo"/></a>
2828
<figcaption>Cryptomator Logo • SVG</figcaption>
2929
</figure>
3030
</div>
3131
<div class="w-full px-3 lg:w-1/2">
3232
<figure class="white-box text-center p-2">
33-
<a href="/presskit/cryptomator-logo-text.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-logo-text.png" alt="Cryptomator Logo mit Text"/></a>
33+
<a href="/presskit/cryptomator-logo-text.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-logo-text.png" alt="Cryptomator Logo mit Text"/></a>
3434
<figcaption>Cryptomator Logo mit Text • 1944x384 • PNG</figcaption>
3535
</figure>
3636
</div>
3737
<div class="w-full px-3 lg:w-1/2">
3838
<figure class="white-box text-center p-2">
39-
<a href="/presskit/cryptomator-hub-logo-text.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-hub-logo-text.png" alt="Cryptomator Hub Logo mit Text"/></a>
39+
<a href="/presskit/cryptomator-hub-logo-text.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-hub-logo-text.png" alt="Cryptomator Hub Logo mit Text"/></a>
4040
<figcaption>Cryptomator Hub Logo mit Text • 2394x384 • PNG</figcaption>
4141
</figure>
4242
</div>

‎content/presskit/01-logos.en.md‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ weight: 1
66
<div class="flex flex-wrap -mx-3">
77
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
88
<figure class="white-box text-center p-2">
9-
<a href="/presskit/cryptomator-logo.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-logo.png" alt="Cryptomator Logo"/></a>
9+
<a href="/presskit/cryptomator-logo.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-logo.png" alt="Cryptomator Logo"/></a>
1010
<figcaption>Cryptomator Logo • 1024x1024 • PNG</figcaption>
1111
</figure>
1212
</div>
1313
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
1414
<figure class="white-box text-center p-2">
15-
<a href="/presskit/cryptomator-android-icon.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-android-icon.png" alt="Cryptomator for Android App Icon"/></a>
15+
<a href="/presskit/cryptomator-android-icon.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-android-icon.png" alt="Cryptomator for Android App Icon"/></a>
1616
<figcaption>Cryptomator for Android App Icon • 1024x1024 • PNG</figcaption>
1717
</figure>
1818
</div>
1919
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
2020
<figure class="white-box text-center p-2">
21-
<a href="/presskit/cryptomator-ios-icon.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-ios-icon.png" alt="Cryptomator for iOS App Icon"/></a>
21+
<a href="/presskit/cryptomator-ios-icon.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-ios-icon.png" alt="Cryptomator for iOS App Icon"/></a>
2222
<figcaption>Cryptomator for iOS App Icon • 1024x1024 • PNG</figcaption>
2323
</figure>
2424
</div>
2525
<div class="w-full px-3 md:w-1/2 lg:w-1/4">
2626
<figure class="white-box text-center p-2">
27-
<a href="/presskit/cryptomator-logo.svg"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-logo.svg" alt="Cryptomator Logo"/></a>
27+
<a href="/presskit/cryptomator-logo.svg"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-logo.svg" alt="Cryptomator Logo"/></a>
2828
<figcaption>Cryptomator Logo • SVG</figcaption>
2929
</figure>
3030
</div>
3131
<div class="w-full px-3 lg:w-1/2">
3232
<figure class="white-box text-center p-2">
33-
<a href="/presskit/cryptomator-logo-text.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-logo-text.png" alt="Cryptomator Logo with Text"/></a>
33+
<a href="/presskit/cryptomator-logo-text.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-logo-text.png" alt="Cryptomator Logo with Text"/></a>
3434
<figcaption>Cryptomator Logo with Text • 1944x384 • PNG</figcaption>
3535
</figure>
3636
</div>
3737
<div class="w-full px-3 lg:w-1/2">
3838
<figure class="white-box text-center p-2">
39-
<a href="/presskit/cryptomator-hub-logo-text.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cryptomator-hub-logo-text.png" alt="Cryptomator Hub Logo with Text"/></a>
39+
<a href="/presskit/cryptomator-hub-logo-text.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cryptomator-hub-logo-text.png" alt="Cryptomator Hub Logo with Text"/></a>
4040
<figcaption>Cryptomator Hub Logo with Text • 2394x384 • PNG</figcaption>
4141
</figure>
4242
</div>

‎content/presskit/02-developer-info.de.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ Weitere Informationen gibt es {{< extlink "https://skymatic.de/" "auf der Websit
1010
<div class="flex flex-wrap -mx-3">
1111
<div class="w-full px-3 lg:w-1/2">
1212
<figure class="white-box text-center p-2">
13-
<a href="/presskit/skymatic-team-1.jpg"><img class="inline-block m-remover lazyload" data-src="/presskit/skymatic-team-1.jpg" alt="Christian Schmickler, Armin Schrenk, Sebastian Stenzel, Julian Raufelder, Tobias Hagemann"/></a>
13+
<a href="/presskit/skymatic-team-1.jpg"><img class="inline-block m-0! lazyload" data-src="/presskit/skymatic-team-1.jpg" alt="Christian Schmickler, Armin Schrenk, Sebastian Stenzel, Julian Raufelder, Tobias Hagemann"/></a>
1414
<figcaption>Christian Schmickler, Armin Schrenk, Sebastian Stenzel, Julian Raufelder, Tobias Hagemann • Foto: Fynn Schubert • 1620x1080 • JPG</figcaption>
1515
</figure>
1616
</div>
1717
<div class="w-full px-3 lg:w-1/2">
1818
<figure class="white-box text-center p-2">
19-
<a href="/presskit/skymatic-team-2.jpg"><img class="inline-block m-remover lazyload" data-src="/presskit/skymatic-team-2.jpg" alt="Julian Raufelder, Tobias Hagemann, Armin Schrenk, Christian Schmickler, Sebastian Stenzel"/></a>
19+
<a href="/presskit/skymatic-team-2.jpg"><img class="inline-block m-0! lazyload" data-src="/presskit/skymatic-team-2.jpg" alt="Julian Raufelder, Tobias Hagemann, Armin Schrenk, Christian Schmickler, Sebastian Stenzel"/></a>
2020
<figcaption>Julian Raufelder, Tobias Hagemann, Armin Schrenk, Christian Schmickler, Sebastian Stenzel • Foto: Fynn Schubert • 1620x1080 • JPG</figcaption>
2121
</figure>
2222
</div>

‎content/presskit/02-developer-info.en.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ Further information can be found {{< extlink "https://skymatic.de/en/" "on the S
1010
<div class="flex flex-wrap -mx-3">
1111
<div class="w-full px-3 lg:w-1/2">
1212
<figure class="white-box text-center p-2">
13-
<a href="/presskit/skymatic-team-1.jpg"><img class="inline-block m-remover lazyload" data-src="/presskit/skymatic-team-1.jpg" alt="Christian Schmickler, Armin Schrenk, Sebastian Stenzel, Julian Raufelder, Tobias Hagemann"/></a>
13+
<a href="/presskit/skymatic-team-1.jpg"><img class="inline-block m-0! lazyload" data-src="/presskit/skymatic-team-1.jpg" alt="Christian Schmickler, Armin Schrenk, Sebastian Stenzel, Julian Raufelder, Tobias Hagemann"/></a>
1414
<figcaption>Christian Schmickler, Armin Schrenk, Sebastian Stenzel, Julian Raufelder, Tobias Hagemann • Photo: Fynn Schubert • 1620x1080 • JPG</figcaption>
1515
</figure>
1616
</div>
1717
<div class="w-full px-3 lg:w-1/2">
1818
<figure class="white-box text-center p-2">
19-
<a href="/presskit/skymatic-team-2.jpg"><img class="inline-block m-remover lazyload" data-src="/presskit/skymatic-team-2.jpg" alt="Julian Raufelder, Tobias Hagemann, Armin Schrenk, Christian Schmickler, Sebastian Stenzel"/></a>
19+
<a href="/presskit/skymatic-team-2.jpg"><img class="inline-block m-0! lazyload" data-src="/presskit/skymatic-team-2.jpg" alt="Julian Raufelder, Tobias Hagemann, Armin Schrenk, Christian Schmickler, Sebastian Stenzel"/></a>
2020
<figcaption>Julian Raufelder, Tobias Hagemann, Armin Schrenk, Christian Schmickler, Sebastian Stenzel • Photo: Fynn Schubert • 1620x1080 • JPG</figcaption>
2121
</figure>
2222
</div>

‎content/presskit/04-awards.de.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ Cryptomator ist Preisträger des CeBIT Innovation Awards 2016 und Gewinner des {
88
<div class="flex flex-wrap -mx-3">
99
<div class="w-full px-3 md:w-1/2 lg:w-1/3">
1010
<figure class="white-box text-center p-2">
11-
<a href="/presskit/cebit-award-2016.jpg"><img class="inline-block m-remover lazyload" data-src="/presskit/cebit-award-2016.jpg" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
11+
<a href="/presskit/cebit-award-2016.jpg"><img class="inline-block m-0! lazyload" data-src="/presskit/cebit-award-2016.jpg" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
1212
<figcaption>CeBIT Innovation Award 2016 for Usable Security and Privacy • 2666x2000 • JPG</figcaption>
1313
</figure>
1414
</div>
1515
<div class="w-full px-3 md:w-1/2 lg:w-1/3">
1616
<figure class="white-box text-center p-2">
17-
<a href="/presskit/cebit-award-2016.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cebit-award-2016.png" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
17+
<a href="/presskit/cebit-award-2016.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cebit-award-2016.png" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
1818
<figcaption>CeBIT Innovation Award 2016 for Usable Security and Privacy • 640x480 • PNG</figcaption>
1919
</figure>
2020
</div>

‎content/presskit/04-awards.en.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,13 @@ Cryptomator is awardee of the CeBIT Innovation Award 2016 and won the {{< extlin
88
<div class="flex flex-wrap -mx-3">
99
<div class="w-full px-3 md:w-1/2 lg:w-1/3">
1010
<figure class="white-box text-center p-2">
11-
<a href="/presskit/cebit-award-2016.jpg"><img class="inline-block m-remover lazyload" data-src="/presskit/cebit-award-2016.jpg" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
11+
<a href="/presskit/cebit-award-2016.jpg"><img class="inline-block m-0! lazyload" data-src="/presskit/cebit-award-2016.jpg" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
1212
<figcaption>CeBIT Innovation Award 2016 for Usable Security and Privacy • 2666x2000 • JPG</figcaption>
1313
</figure>
1414
</div>
1515
<div class="w-full px-3 md:w-1/2 lg:w-1/3">
1616
<figure class="white-box text-center p-2">
17-
<a href="/presskit/cebit-award-2016.png"><img class="inline-block m-remover lazyload" data-src="/presskit/cebit-award-2016.png" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
17+
<a href="/presskit/cebit-award-2016.png"><img class="inline-block m-0! lazyload" data-src="/presskit/cebit-award-2016.png" alt="CeBIT Innovation Award 2016 for Usable Security and Privacy"/></a>
1818
<figcaption>CeBIT Innovation Award 2016 for Usable Security and Privacy • 640x480 • PNG</figcaption>
1919
</figure>
2020
</div>

0 commit comments

Comments
 (0)