Compare commits

...

2 commits

Author SHA1 Message Date
d31f73e314 Merge remote-tracking branch 'origin/develop' into develop
All checks were successful
continuous-integration/drone/pr Build is passing
continuous-integration/drone/push Build is passing
2020-11-15 19:25:06 +01:00
09efc98e2a fixed typo in privacy
fixed styles
added new public list for matrix
2020-11-15 19:24:58 +01:00
4 changed files with 7 additions and 12 deletions

View file

@ -56,7 +56,7 @@ title: Datenschutzerklärung
<h2>Weitergabe von Daten</h2> <h2>Weitergabe von Daten</h2>
<p> <p>
Wie oben bereits erwähnt, verarbeiten wir alle Daten auf Servern unseres Hosting-Providers <a Wie oben bereits erwähnt, verarbeiten wir alle Daten auf Servern unseres Hosting-Providers <a
href="https://www.netcup.de">netcup</a>. Darüber hinaus geben geben wir deine Daten nicht an Dritte weiter. href="https://www.netcup.de">netcup</a>. Darüber hinaus geben wir deine Daten nicht an Dritte weiter.
</p> </p>
</div> </div>
<div class="mb-3"> <div class="mb-3">

View file

@ -23,7 +23,8 @@ Auf meinem Blog findest du einen einfachen Einstieg in das Matrix-Netzwerk: [Wer
* [Liste öffentlicher Räume](https://view.matrix.org/) * [Liste öffentlicher Räume](https://view.matrix.org/)
* Listen mit öffentlichen Matrix-Servern * Listen mit öffentlichen Matrix-Servern
* [hello-matrix.net](https://www.hello-matrix.net/public_servers.php) * [hello-matrix.net](https://www.hello-matrix.net/public_servers.php)
* [anchel.nl](https://www.anchel.nl/matrix-publiclist/) * [anchel.nl](https://publiclist.anchel.nl/)
* [the-federation.info](https://the-federation.info/protocol/matrix) * [the-federation.info](https://the-federation.info/protocol/matrix)
* [FossMessenger](https://fediverse.blog/~/FossMessenger/matrix-server)
* [Matrix FAQ](https://matrix.org/faq/) * [Matrix FAQ](https://matrix.org/faq/)
* [Account umziehen](https://ems.element.io/tools/matrix-migration) * [Account umziehen](https://ems.element.io/tools/matrix-migration)

View file

@ -11,7 +11,6 @@ Users can choose a public server or create their own and still communicate with
__Since the beginning of 2020 I run a public Matrix server: [matrix.sp-codes.de](https://matrix.sp-codes.de/) And a public Element-Web instance: [chat.sp-codes.de](https://chat.sp-codes.de/)__ __Since the beginning of 2020 I run a public Matrix server: [matrix.sp-codes.de](https://matrix.sp-codes.de/) And a public Element-Web instance: [chat.sp-codes.de](https://chat.sp-codes.de/)__
You can read the server rules [here](https://matrix.sp-codes.de/_matrix/consent). You can read the server rules [here](https://matrix.sp-codes.de/_matrix/consent).
Feel free to create an account on my server or choose one from the list linked below. I look forward to hear from you [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de). Feel free to create an account on my server or choose one from the list linked below. I look forward to hear from you [@samuel-p:matrix.sp-codes.de](https://matrix.to/#/@samuel-p:matrix.sp-codes.de).
@ -24,7 +23,8 @@ On my blog (German) you will find a simple introduction to the Matrix network: [
* [List of public rooms](https://view.matrix.org/) * [List of public rooms](https://view.matrix.org/)
* Lists with public matrix servers * Lists with public matrix servers
* [hello-matrix.net](https://www.hello-matrix.net/public_servers.php) * [hello-matrix.net](https://www.hello-matrix.net/public_servers.php)
* [anchel.nl](https://www.anchel.nl/matrix-publiclist/) * [anchel.nl](https://publiclist.anchel.nl/)
* [the-federation.info](https://the-federation.info/protocol/matrix) * [the-federation.info](https://the-federation.info/protocol/matrix)
* [FossMessenger](https://fediverse.blog/~/FossMessenger/matrix-server)
* [Matrix FAQ](https://matrix.org/faq/) * [Matrix FAQ](https://matrix.org/faq/)
* [Migrate Account](https://ems.element.io/tools/matrix-migration) * [Migrate Account](https://ems.element.io/tools/matrix-migration)

View file

@ -105,9 +105,8 @@ a {
.beta { .beta {
position: absolute; position: absolute;
top: 1rem; top: 0;
right: 0; right: -1rem; font-weight: bold;
font-weight: bold;
background-color: #fea500; background-color: #fea500;
color: #000000; color: #000000;
padding: .5rem 1rem; padding: .5rem 1rem;
@ -148,11 +147,6 @@ a {
margin-left: 0.5rem; margin-left: 0.5rem;
} }
.beta {
top: 0;
right: -1rem;
}
a { a {
color: #fff; color: #fff;
} }