luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-20 12:19:27 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/styles
History
Claire 178e151019 Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
2023-06-25 14:27:38 +02:00
..
contrast Fix wrong colors in the high-contrast theme (#19708) 2022-11-04 02:28:14 +01:00
fonts Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
mastodon Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream 2023-06-25 14:27:38 +02:00
mastodon-light Add onboarding prompt when home feed too slow in web UI (#25267) 2023-06-22 23:48:40 +02:00
application.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
contrast.scss
mailer.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
mastodon-light.scss
win95.scss Update win95 style from cybre.space 2022-04-27 23:05:24 +02:00