Browse Source

Merge pull request 'develop' (#37) from develop into master

Reviewed-on: https://git.sp-codes.de/samuel-p/sp-codes.de/pulls/37
master
Samuel Philipp 2 weeks ago
parent
commit
71d277809e
5 changed files with 10 additions and 15 deletions
  1. + 3
    - 3
      package.json
  2. + 1
    - 1
      src/de/privacy.html
  3. + 2
    - 1
      src/de/services/matrix.md
  4. + 2
    - 2
      src/en/services/matrix.md
  5. + 2
    - 8
      src/scss/main.scss

+ 3
- 3
package.json

@ -16,13 +16,13 @@
"url": "https://git.sp-codes.de/samuel-p/sp-codes.de"
},
"optionalDependencies": {
"browser-sync": "^2.26.12"
"browser-sync": "^2.26.13"
},
"devDependencies": {
"@11ty/eleventy": "^0.11.0",
"@11ty/eleventy": "^0.11.1",
"@11ty/eleventy-navigation": "^0.1.6",
"cpx": "^1.5.0",
"node-sass": "^4.14.1",
"node-sass": "^5.0.0",
"node-sass-tilde-importer": "^1.0.2",
"npm-run-all": "^4.1.5"
},

+ 1
- 1
src/de/privacy.html

@ -56,7 +56,7 @@ title: Datenschutzerklärung
<h2>Weitergabe von Daten</h2>
<p>
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>
</div>
<div class="mb-3">

+ 2
- 1
src/de/services/matrix.md

@ -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/)
* Listen mit öffentlichen Matrix-Servern
* [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)
* [FossMessenger](https://fediverse.blog/~/FossMessenger/matrix-server)
* [Matrix FAQ](https://matrix.org/faq/)
* [Account umziehen](https://ems.element.io/tools/matrix-migration)

+ 2
- 2
src/en/services/matrix.md

@ -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/)__
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).
@ -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/)
* Lists with public matrix servers
* [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)
* [FossMessenger](https://fediverse.blog/~/FossMessenger/matrix-server)
* [Matrix FAQ](https://matrix.org/faq/)
* [Migrate Account](https://ems.element.io/tools/matrix-migration)

+ 2
- 8
src/scss/main.scss

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

Loading…
Cancel
Save