Claire 8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/account.rb`: Conflict due to upstream changing lines adjacent to a change made in glitch-soc to have configurable limits. Ported upstream's changes. - `yarn.lock`: Dependencies adjacent to glitch-soc-only dependencies updated. Updated them as well.		2024-10-26 13:38:07 +02:00
..
_mixins.scss	Follow up tweaking of admin UI changes part 2 (#31268)	2024-08-08 09:21:54 +00:00
about.scss	Change background color in web UI (#29522)	2024-03-12 09:51:30 +00:00
accessibility.scss	Upgrade to Stylelint 15 with Prettier (#23558)	2023-02-13 04:57:03 +01:00
accounts.scss	Remove fontawesome leftovers (#31525)	2024-08-21 15:55:35 +00:00
admin.scss	Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream	2024-10-14 19:46:52 +02:00
basics.scss	Add margin-bottom to error.dialog to reduce whitespace (#25708)	2024-10-04 08:02:14 +00:00
branding.scss	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
components.scss	Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream	2024-10-26 13:38:07 +02:00
containers.scss	Change avatars border radius (#31390)	2024-08-13 07:26:23 +00:00
dashboard.scss	Fix wrapping in dashboard quick access buttons (#32043)	2024-09-24 16:47:45 +00:00
emoji_picker.scss	Fix post filter & report styling (#31349)	2024-08-09 12:45:39 +00:00
forms.scss	Add more explicit explanations about author attribution and fediverse:creator (#32383)	2024-10-17 09:03:08 +00:00
lists.scss	Restore vanilla components	2017-11-17 19:29:16 -08:00
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	Fix scrollbar width (#32091)	2024-09-26 14:26:04 +00:00
rich_text.scss	Change design of rich text elements in web UI (#32633)	2024-10-24 07:28:22 +00:00
rtl.scss	Fix back arrow pointing to the incorrect direction in RTL languages (#32485)	2024-10-15 09:15:25 +00:00
tables.scss	Improve alignment of icons on admin roles list (#32153)	2024-10-01 09:08:29 +00:00
variables.scss	Change design of rich text elements in web UI (#32633)	2024-10-24 07:28:22 +00:00
widgets.scss	Fix missing CSS in moderation interface (#31550)	2024-08-22 18:57:22 +00:00