app/controllers/concerns/theming_concern.rb
Upstream removed pack loading. Polyam-glitch had extra changes for polyam flavour.
Removed as upstream.
app/javascript/core/admin.ts
Upstream deleted this file. It had extra changes from early ports.
Deleted file as upstream.
app/javascript/core/common.js
Upstream deleted this file. It had extra changes from early ports.
Deleted file as upstream and applied extra change to flavours/glitch/packs/common.js and flavours/glitch/common.js
app/javascript/core/embed.ts
Upstream deleted this file. It had extra change from early port.
Deleted file as upstream and added extra change to flavours/glitch/packs/public.tsx and packs/public.tsx
app/lib/themes.rb
Upstream changed and removed lines modified for polyam-glitch.
Applied upstream's changes.
app/views/layouts/_theme.html.haml
Upstream deleted this file. It had extra changes for system theme and color tags.
Deleted as upstream. System theme and color tags will be re-applied in a separate commit.
config/webpack/configuration.js
Upstream removed core and simplified loading of flavours. Polyam-glitch had extra changes to disable skins and vanilla flavour.
Ported changes.
This significantly changes the theming system
Conflicts:
app/controllers/concerns/theming_concern.rb
Upstream removed pack loading. Polyam-glitch had extra changes for polyam flavour. Removed as upstream.app/javascript/core/admin.ts
Upstream deleted this file. It had extra changes from early ports. Deleted file as upstream.app/javascript/core/common.js
Upstream deleted this file. It had extra changes from early ports. Deleted file as upstream and applied extra change toflavours/glitch/packs/common.js
andflavours/glitch/common.js
app/javascript/core/embed.ts
Upstream deleted this file. It had extra change from early port. Deleted file as upstream and added extra change toflavours/glitch/packs/public.tsx
andpacks/public.tsx
app/lib/themes.rb
Upstream changed and removed lines modified for polyam-glitch. Applied upstream's changes.app/views/layouts/_theme.html.haml
Upstream deleted this file. It had extra changes for system theme and color tags. Deleted as upstream. System theme and color tags will be re-applied in a separate commit.config/webpack/configuration.js
Upstream removed core and simplified loading of flavours. Polyam-glitch had extra changes to disable skins and vanilla flavour. Ported changes.Ported changes:
theme.yml
changes)Additional changes: