Conflicts are too numerous to list, but they are all caused by upstream's
theming changes and all have to do with the differences between upstream and
glitch-soc in the theming systems.
They were all manually resolved by adapting the relevant code.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream simplified `theme_style_tags`. Our version is different because of
the different theming system.
Adapted upstream's changes.
- `app/views/layouts/error.html.haml`:
Theming system.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream modified `theme_color_tags` to work on color scheme rather than theme.
Updated it as well.
- `app/views/layouts/embedded.html.haml`:
Upstream changed the embed theme from `mastodon-light` to `system`.
Glitch-soc doesn't use a hardcoded value, so ignore the change.
- `spec/helpers/theme_helper_spec.rb`:
Accomodate `theme_color_tags` changes.
Conflicts:
- `app/views/layouts/application.html.haml`:
Upstream changed how theming works, and in particular changed the set of HTML attributes.
Adapted upstream's change.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added a helper to insert javascript tags, close to where we had
modified code.
Ported upstream's change.
Conflicts:
- `app/models/form/admin_settings.rb`:
Upstream added a method right next to glitch-soc-only methods.
Added upstream's method.
- `app/views/settings/preferences/appearance/show.html.haml`:
Upstream changed a line right next to a glitch-soc addition.
Changed the code as upstream did.
- `app/helpers/application_helper.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
- `spec/helpers/application_helper_spec.rb`:
Upstream updated the classes used for theming purposes,
but glitch-soc has its own theming system.
Adapted upstream's changes.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream removed the feature flag and refactored, while we have a slightly
different theming system.
Updated accordingly.
- `stylelint.config.js`:
Upstream removed overrides for the temporary themes.
Did the same.
Conflicts:
- `app/helpers/theme_helper.rb`:
Upstream added an experimental feature flag to try out theme refactors.
Glitch-soc's theming system is too different, so skips the new feature flag.
- `stylelint.config.js`:
Ditto.
