Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-25 20:06:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
- `app/javascript/packs/public.jsx`:
  In glitch-soc, this file was split across the following files:
  - `app/javascript/packs/public.jsx`
  - `app/javascript/core/embed.js`
  - `app/javascript/core/settings.js`
  Update all those files accordingly, as well as the related `theme.yml` files.
This commit is contained in:
Claire
2024-03-15 22:37:55 +01:00
parent 6ee7a64465 c76ae7a5c0
commit 1b06e4e1b7
9 changed files with 478 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/javascript/core/theme.yml
View File

@@ -7,7 +7,7 @@ pack:
common:
filename: common.js
stylesheet: true
embed: embed.js
embed: embed.ts
error:
home:
inert:
@@ -18,7 +18,7 @@ pack:
stylesheet: true
modal:
public:
settings: settings.js
settings: settings.ts
sign_up:
share:
remote_interaction_helper: remote_interaction_helper.ts