catstodon/app/javascript/styles/mastodon
Claire ad1098970b Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.
2023-05-25 22:49:18 +02:00
..
_mixins.scss Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
about.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
accessibility.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
accounts.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
admin.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
basics.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +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
components.scss Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream 2023-05-25 20:43:25 +02:00
containers.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
dashboard.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
emoji_picker.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
forms.scss Add hCaptcha support (#25019) 2023-05-16 23:27:35 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
polls.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rich_text.scss Fix styling regressions from RTL layout refactor (#24415) 2023-04-04 16:48:34 +02:00
rtl.scss Fix styling regressions from RTL layout refactor (#24415) 2023-04-04 16:48:34 +02:00
statuses.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
tables.scss Fix SCSS linting issues (#2207) 2023-05-07 15:04:59 +02:00
variables.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
widgets.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00