Merge commit 'd13d7b4566d551d027830f7dfc987ba3a8e2dd4f' into glitch-soc/merge-upstream

Conflicts are too numerous to list, but they are all caused by upstream's theming changes and all have to do with the differences between upstream and glitch-soc in the theming systems. They were all manually resolved by adapting the relevant code.
2026-02-11 13:32:18 +01:00
parent 8d1bf0dda5 d13d7b4566
commit 4fbd1ad7ae
41 changed files with 372 additions and 243 deletions
@@ -1 +0,0 @@
-@use '@/flavours/glitch/styles/contrast';
@@ -1,12 +0,0 @@
-en:
-  skins:
-    glitch:
-      contrast: High contrast
-cs:
-  skins:
-    glitch:
-      contrast: Vysoký kontrast
-es:
-  skins:
-    glitch:
-      contrast: Alto contraste
@@ -1 +0,0 @@
-@use '@/flavours/glitch/styles/mastodon-light';
@@ -1,12 +0,0 @@
-en:
-  skins:
-    glitch:
-      mastodon-light: Mastodon (light)
-cs:
-  skins:
-    glitch:
-      mastodon-light: Mastodon (světlý)
-es:
-  skins:
-    glitch:
-      mastodon-light: Mastodon (claro)
@@ -1 +0,0 @@
-@use '@/styles/contrast';
@@ -1,12 +0,0 @@
-en:
-  skins:
-    vanilla:
-      contrast: High contrast
-cs:
-  skins:
-    vanilla:
-      contrast: Vysoký kontrast
-es:
-  skins:
-    vanilla:
-      contrast: Alto contraste
@@ -1 +0,0 @@
-@use '@/styles/mastodon-light';
@@ -1,12 +0,0 @@
-en:
-  skins:
-    vanilla:
-      mastodon-light: Mastodon (light)
-cs:
-  skins:
-    vanilla:
-      mastodon-light: Mastodon (světlý)
-es:
-  skins:
-    glitch:
-      mastodon-light: Mastodon (claro)
				`@@ -1 +0,0 @@`
				`@use '@/flavours/glitch/styles/mastodon-light';`