Claire 4415005de7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/mastodon/features/compose/components/compose_form.js`: Conflict caused because of minor code style change upstream, while glitch-soc has different code for handling variable maximum chars. Ported the change. - `app/serializers/initial_state_serializer.rb`: Conflict because glitch-soc had two extra attributes where upstream added one. Added upstream's attribute.		2022-05-16 22:29:05 +02:00
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	2020-01-27 13:44:29 +01:00
about.scss	Remove duplicate CSS properties (#16278)	2021-05-19 23:51:52 +02:00
accessibility.scss	Improve rendering of emoji which do not contrast with background (#13772)	2020-06-09 10:28:23 +02:00
accounts.scss	Add trending statuses (#17431)	2022-02-25 00:34:14 +01:00
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-22 17:00:38 +01:00
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	2020-06-25 01:33:01 +02:00
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	2021-06-25 04:45:30 +02:00
compact_header.scss	Separate high contrast theme (#7213)	2018-04-21 21:35:55 +02:00
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-16 22:29:05 +02:00
containers.scss	Change appearance of account cards in web UI (#17689)	2022-03-07 11:38:52 +01:00
dashboard.scss	Add trending links (#16917)	2021-11-25 13:07:38 +01:00
emoji_picker.scss	Fix background-color of emoji-mart selector (#17011)	2021-11-19 18:21:37 +01:00
footer.scss	Fix privacy policy link not being visible on small screens (#17533)	2022-02-13 02:52:34 +01:00
forms.scss	Change visual separation of applications in authorized apps list (#17686)	2022-03-02 20:28:25 +01:00
introduction.scss	Fix performance of home feed regeneration (#12084)	2019-10-06 22:11:17 +02:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
modal.scss	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
polls.scss	Spelling (#17705)	2022-03-06 22:51:40 +01:00
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-24 13:32:23 +01:00
rtl.scss	Change appearance of account cards in web UI (#17689)	2022-03-07 11:38:52 +01:00
statuses.scss	Fix logo button style more (#15458)	2020-12-30 23:18:39 +01:00
tables.scss	Change design of federation pages in admin UI (#17704)	2022-03-09 08:52:32 +01:00
variables.scss	Add interrelationship icon (#15149)	2020-11-12 17:43:12 +01:00
widgets.scss	Add batch suspend for accounts in admin UI (#17009)	2021-12-05 21:48:39 +01:00