Claire ef3d15554b Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Changes were already cherry-picked and updated further in glitch-soc. Kept glitch-soc's version. - `README.md`: Upstream updated its README, we have a completely different one. Kept glitch-soc's README. - `app/models/account.rb`: Not a real conflict, upstream updated some lines textually adjacent to glitch-soc-specific lines. Ported upstream's changes.		2024-02-24 14:46:14 +01:00
..
_mixins.scss	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
about.scss	…
accessibility.scss	…
accounts.scss	Add `authorized_fetch` server setting in addition to env var (#25798)	2023-09-01 15:41:10 +02:00
admin.scss	Merge commit '6936e5aa693ccc4aabd26ef18a65fbb8132f6f74' into glitch-soc/merge-upstream-composer	2024-02-22 20:58:41 +01:00
basics.scss	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
branding.scss	…
components.scss	Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream	2024-02-24 14:46:14 +01:00
containers.scss	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
dashboard.scss	…
emoji_picker.scss	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
forms.scss	Change to single opt-in during profile setup in onboarding in web UI (#27876)	2023-11-17 10:37:04 +00:00
lists.scss	…
modal.scss	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
polls.scss	Change design of compose form in web UI (#28119)	2024-01-25 15:41:31 +00:00
reset.scss	…
rich_text.scss	…
rtl.scss	Fix dismiss button overlapping with text in dismissable banners (#26935)	2023-09-15 19:53:28 +02:00
statuses.scss	…
tables.scss	Add admin notifications for new Mastodon versions (#26582)	2023-09-01 17:47:07 +02:00
variables.scss	change column link to add a better keyboard focus indicator (#26278)	2023-08-02 19:33:41 +02:00
widgets.scss	…