Claire 077183a121 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/settings/preferences_controller.rb`: Upstream dropping `digest` from notifications emails while we have more notification emails settings. Removed `digest` from our list while keeping our extra settings. - `app/javascript/packs/admin.js`: Conflicts caused by glitch-soc's theming system. Applied the changes to `app/javascript/core/admin.js`. - `app/views/settings/preferences/other/show.html.haml`: Upstream removed a setting close to a glitch-soc-only setting. Applied upstream's change.		2022-08-28 11:31:00 +02:00
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	2020-01-27 13:44:29 +01:00
about.scss	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +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	Fix badge color not affected (#18826)	2022-07-19 01:06:11 +02:00
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-07-05 09:33:44 +02:00
basics.scss	Fix logo gradient not working on some Safari and Blink-based browsers (#18634)	2022-06-10 17:34:59 +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
branding.scss	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
compact_header.scss	…
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	2022-08-25 05:07:39 +02:00
containers.scss	Fix contrast of some elements with new brand colors (#18691)	2022-06-19 08:18:08 +02:00
dashboard.scss	Fix contrast of some elements with new brand colors (#18691)	2022-06-19 08:18:08 +02:00
emoji_picker.scss	Replace from Code Climate to Super-Linter (#18587)	2022-06-01 19:22:35 +02:00
footer.scss	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
forms.scss	Add customizable user roles (#18641)	2022-07-05 02:41:40 +02:00
lists.scss	…
modal.scss	Use custom mascot on static share page (#15687)	2021-02-11 02:18:56 +01:00
polls.scss	Replace from Code Climate to Super-Linter (#18587)	2022-06-01 19:22:35 +02:00
reset.scss	…
rtl.scss	Change appearance of account cards in web UI (#17689)	2022-03-07 11:38:52 +01:00
statuses.scss	Fix contrast of some elements with new brand colors (#18691)	2022-06-19 08:18:08 +02:00
tables.scss	Add ability to select all accounts matching search for batch actions (#19053)	2022-08-25 23:33:34 +02:00
variables.scss	Fix contrast of some elements with new brand colors (#18691)	2022-06-19 08:18:08 +02:00
widgets.scss	Add batch suspend for accounts in admin UI (#17009)	2021-12-05 21:48:39 +01:00