tarrien/Mastodon
1
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Too many conflicts to list, because of webpack → vite migration.
This commit is contained in:
Claire committed 2025-05-25 14:36:51 +02:00
2 parents a8ed678761 c4f47adb49
commit f49940db85
159 files changed
+2373 -7784
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/javascript/skins/glitch/application.scss
+1
View File
@@ -0,0 +1 @@
@use '@/flavours/glitch/styles/application';
app/javascript/skins/glitch/contrast.scss
+1
View File
@@ -0,0 +1 @@
@use '@/flavours/glitch/styles/contrast';
app/javascript/skins/glitch/contrast/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'flavours/glitch/styles/contrast';
app/javascript/skins/glitch/default/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'flavours/glitch/styles/application';
app/javascript/skins/glitch/mastodon-light.scss
+1
View File
@@ -0,0 +1 @@
@use '@/flavours/glitch/styles/mastodon-light';
app/javascript/skins/glitch/mastodon-light/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'flavours/glitch/styles/mastodon-light';
app/javascript/skins/vanilla/application.scss
+1
View File
@@ -0,0 +1 @@
@use '@/styles/application';
app/javascript/skins/vanilla/contrast.scss
+1
View File
@@ -0,0 +1 @@
@use '@/styles/contrast';
app/javascript/skins/vanilla/contrast/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'styles/contrast';
app/javascript/skins/vanilla/default/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'styles/application';
app/javascript/skins/vanilla/mastodon-light.scss
+1
View File
@@ -0,0 +1 @@
@use '@/styles/mastodon-light';
app/javascript/skins/vanilla/mastodon-light/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'styles/mastodon-light';
app/javascript/skins/vanilla/win95.scss
+1
View File
@@ -0,0 +1 @@
@use '@/styles/win95';
app/javascript/skins/vanilla/win95/common.scss
-1
View File
@@ -1 +0,0 @@
@use 'styles/win95';