mastodon/app/javascript/styles/mastodon
Claire fe5f6bc7ed Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Fix erroneous deletion in a previous merge.
- `Gemfile`:
  Conflict caused by glitch-soc-only hCaptcha dependency
- `app/controllers/auth/sessions_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/controllers/filters_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
- `app/serializers/rest/status_serializer.rb`:
  Minor conflict due to glitch-soc having an extra `local_only` property
2022-06-28 11:11:18 +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 Add trending statuses (#17431) 2022-02-25 00:34:14 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2022-06-28 11:11:18 +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-06-28 11:11:18 +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 Revamp post filtering system (#18058) 2022-06-28 09:42:13 +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 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 contrast of some elements with new brand colors (#18691) 2022-06-19 08:18:08 +02:00
tables.scss Change design of federation pages in admin UI (#17704) 2022-03-09 08:52:32 +01: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