monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2698 from ClearlyClaire/glitch-soc/refactor/index-application 

Rename `app/javascript/flavours/glitch/styles/index.scss` to `application.scss`
This commit is contained in:
Claire 2024-05-01 13:09:43 +02:00 committed by GitHub
parent 6f74ede26b d6048d3a6c
commit 3024212403
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 34 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/javascript/flavours/glitch/styles/application.scss Normal file
View File

@ -0,0 +1,27 @@
@import 'mixins';
@import 'variables';
@import 'styles/fonts/roboto';
@import 'styles/fonts/roboto-mono';
@import 'reset';
@import 'basics';
@import 'branding';
@import 'containers';
@import 'lists';
@import 'widgets';
@import 'forms';
@import 'accounts';
@import 'statuses';
@import 'components';
@import 'polls';
@import 'modal';
@import 'emoji_picker';
@import 'about';
@import 'tables';
@import 'admin';
@import 'dashboard';
@import 'rtl';
@import 'accessibility';
@import 'rich_text';
@import 'glitch_local_settings';
@import 'glitch_doodle';

2
app/javascript/flavours/glitch/styles/contrast.scss
View File

@ -1,3 +1,3 @@
@import 'contrast/variables';
@import 'index';
@import 'application';
@import 'contrast/diff';

30
app/javascript/flavours/glitch/styles/index.scss
View File

@ -1,27 +1,5 @@
@import 'mixins';
@import 'variables';
@import 'styles/fonts/roboto';
@import 'styles/fonts/roboto-mono';
/* This is a compat file so that third-party themes do not have to immediately
update their implementation, as the previous `index.scss` has been renamed
to `application.scss`. */
@import 'reset';
@import 'basics';
@import 'branding';
@import 'containers';
@import 'lists';
@import 'modal';
@import 'widgets';
@import 'forms';
@import 'accounts';
@import 'statuses';
@import 'components';
@import 'polls';
@import 'emoji_picker';
@import 'about';
@import 'tables';
@import 'admin';
@import 'accessibility';
@import 'rtl';
@import 'dashboard';
@import 'rich_text';
@import 'glitch_local_settings';
@import 'glitch_doodle';
@import 'application';

2
app/javascript/flavours/glitch/styles/mastodon-light.scss
View File

@ -1,3 +1,3 @@
@import 'mastodon-light/variables';
@import 'index';
@import 'application';
@import 'mastodon-light/diff';

2
app/javascript/skins/glitch/default/common.scss
View File

@ -1 +1 @@
@import 'flavours/glitch/styles/index';
@import 'flavours/glitch/styles/application';