You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		1 year ago
..
contrast	Fix wrong colors in the high-contrast theme (#19708)	2 years ago
fonts	Fix SCSS linting issues (#2207)	2 years ago
mastodon	Merge commit '55e7c08a83547424024bac311d5459cb82cf6dae' into glitch-soc/merge-upstream	1 year ago
mastodon-light	Add onboarding prompt when home feed too slow in web UI (#25267)	1 year ago
application.scss	Add support for incoming rich text (#23913)	2 years ago
contrast.scss	Separate high contrast theme (#7213)	7 years ago
mailer.scss	Fix SCSS linting issues (#2207)	2 years ago
mastodon-light.scss	More polished light theme (#7620)	7 years ago
win95.scss	Update win95 style from cybre.space	3 years ago