mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-12-12 01:39:04 +01:00
a6147a831f
Conflicts: - `app/lib/themes.rb` - `app/views/layouts/application.html.haml` - `app/views/layouts/embedded.html.haml` - `app/views/layouts/error.html.haml` - `config/settings.yml` All these conflicts are because glitch-soc and upstream have different theming systems and upstream changed a few things to have dynamic theme selection based on system settings. Conflicts were solved to take that into account, and `current_theme` has been changed in the process to return a tuple of `[flavour, skin]` to be used in the `theme_style_tags` helper. |
||
|---|---|---|
| .. | ||
| admin | ||
| api | ||
| auth | ||
| settings | ||
| account_controller_concern.rb | ||
| account_owned_concern.rb | ||
| accountable_concern.rb | ||
| authorization.rb | ||
| cache_concern.rb | ||
| challengable_concern.rb | ||
| localized.rb | ||
| session_tracking_concern.rb | ||
| signature_authentication.rb | ||
| signature_verification.rb | ||
| theming_concern.rb | ||
| user_tracking_concern.rb | ||
| web_app_controller_concern.rb | ||