Jeremy Kescher 48373a71e3 Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/javascript/flavours/glitch/components/status_action_bar.js # app/javascript/flavours/glitch/containers/status_container.js # app/javascript/flavours/glitch/features/status/components/action_bar.js # app/javascript/flavours/glitch/locales/de.json # app/javascript/flavours/glitch/locales/fr.json # app/javascript/mastodon/components/status_action_bar.js # app/javascript/mastodon/features/status/components/action_bar.js # config/locales-glitch/de.yml # config/locales-glitch/fr.yml # config/locales-glitch/simple_form.de.yml # config/locales-glitch/simple_form.fr.yml		2023-01-05 23:29:53 +01:00
..
components	Merge remote-tracking branch 'upstream/main' into develop	2023-01-05 23:29:53 +01:00
contrast	[Glitch] Fix wrong colors in the high-contrast theme	2022-11-06 17:29:04 +01:00
mastodon-light	Fix pillbar buttons in light theme (#1972)	2022-11-25 13:54:43 +01:00
_mixins.scss	[Glitch] Add logged-out access to the web UI	2022-10-09 15:29:14 +02:00
about.scss	[Glitch] Change about page to be mounted in the web UI	2022-10-28 19:24:02 +02:00
accessibility.scss	Change glitch-soc composer classes to match upstream	2022-11-06 17:29:04 +01:00
accounts.scss	Add “Glitch-only” label to glitch-specific settings	2022-11-12 11:30:35 +01:00
admin.scss	[Glitch] Replace flex styling with sensible layout rules	2023-01-02 17:32:29 +01:00
basics.scss	[Glitch] Fix logo gradient not working on some Safari and Blink-based browsers	2022-06-11 00:09:20 +02:00
branding.scss	[Glitch] Change brand color and logotypes	2022-06-11 00:09:20 +02:00
containers.scss	Change glitch-soc composer classes to match upstream	2022-11-06 17:29:04 +01:00
contrast.scss	[Glitch] Add high-contrast theme	2018-05-05 22:33:02 +02:00
dashboard.scss	[Glitch] Change about page to be mounted in the web UI	2022-10-28 19:24:02 +02:00
forms.scss	[Glitch] Only remove padding when listing applications	2022-11-12 13:55:43 +01:00
index.scss	[Glitch] Change public accounts pages to mount the web UI	2022-10-28 19:24:02 +02:00
lists.scss	Rename themes -> flavours ? ?	2017-12-03 23:26:40 -08:00
mastodon-light.scss	Light theme overhaul	2018-09-04 16:01:41 +02:00
modal.scss	[Glitch] Add transparancy to modal background for accessibility	2022-12-15 21:04:20 +01:00
oatstodon.scss	Oatstodon flavour: Make avatars rounded squares again rather than circles	2022-08-27 11:24:24 +02:00
polls.scss	[Glitch] Improve the contrast of the chart in “poll has ended” notifications	2023-01-05 15:11:23 +01:00
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	2019-01-25 11:48:27 +01:00
rtl.scss	Fix light theme issues with the favourite modal and some background colors (#1902)	2022-11-07 10:34:18 +01:00
statuses.scss	Fix inconsistent with “translate” button padding	2022-11-30 13:53:38 +01:00
tables.scss	[Glitch] Stick batch table toolbar to the top	2022-11-14 09:05:56 +01:00
variables.scss	[Glitch] Fix intermediary responsive layout, accessibility on navigation in web UI	2022-10-28 19:24:02 +02:00
widgets.scss	[Glitch] Change about page to be mounted in the web UI	2022-10-28 19:24:02 +02:00