mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-12-29 23:23:10 +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/glitch/application.scss
Normal file
1
app/javascript/skins/glitch/application.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/flavours/glitch/styles/application';
|
||||
1
app/javascript/skins/glitch/contrast.scss
Normal file
1
app/javascript/skins/glitch/contrast.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/flavours/glitch/styles/contrast';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'flavours/glitch/styles/contrast';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'flavours/glitch/styles/application';
|
||||
1
app/javascript/skins/glitch/mastodon-light.scss
Normal file
1
app/javascript/skins/glitch/mastodon-light.scss
Normal file
@@ -0,0 +1 @@
|
||||
@use '@/flavours/glitch/styles/mastodon-light';
|
||||
@@ -1 +0,0 @@
|
||||
@use 'flavours/glitch/styles/mastodon-light';
|
||||
Reference in New Issue
Block a user