mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-29 07:03:16 +01:00
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
Too many conflicts to list, because of webpack → vite migration.
This commit is contained in:
1
app/javascript/skins/vanilla/application.scss
Normal file
1
app/javascript/skins/vanilla/application.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/styles/application';
|
||||
1
app/javascript/skins/vanilla/contrast.scss
Normal file
1
app/javascript/skins/vanilla/contrast.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/styles/contrast';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'styles/contrast';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'styles/application';
|
||||
1
app/javascript/skins/vanilla/mastodon-light.scss
Normal file
1
app/javascript/skins/vanilla/mastodon-light.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/styles/mastodon-light';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'styles/mastodon-light';
|
||||
1
app/javascript/skins/vanilla/win95.scss
Normal file
1
app/javascript/skins/vanilla/win95.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/styles/win95';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'styles/win95';
|
||||
Reference in New Issue
Block a user