Claire ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.jsx`: Upstream changed how icons are handled, including on a line modified by glitch-soc to bump the number of poll options. Applied upstream's change, while keeping the increased number of poll options.		2023-10-25 12:14:24 +02:00
..
_mixins.scss	…
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 '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream	2023-09-02 15:02:29 +02:00
basics.scss	change column link to add a better keyboard focus indicator (#26278)	2023-08-02 19:33:41 +02:00
branding.scss	…
components.scss	Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream	2023-10-25 12:14:24 +02:00
containers.scss	…
dashboard.scss	Change button colors to increase hover/focus contrast and consistency (#25677)	2023-07-03 11:32:31 +02:00
emoji_picker.scss	…
forms.scss	Add `authorized_fetch` server setting in addition to env var (#25798)	2023-09-01 15:41:10 +02:00
lists.scss	…
modal.scss	…
polls.scss	Revert poll colors to green outside of compose form (#26164)	2023-07-25 15:32:59 +02: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	Fix follow link style in embeds (#25965)	2023-07-13 12:58:56 +02:00
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	…