Merge pull request #2213 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Merge commit '0ad2413b35287958f59073a5b63aecc659a64d98' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/styles/mastodon/forms.scss`:
  Conflict because we ran eslint autofix on upstream files.
- `config/initializers/content_security_policy.rb`:
  Code style changes but we have a different version.
  Kept our version.
- `streaming/index.js`:
  Upstream fixed a typo close to glitch-soc-only code.
  Applied upstream's changes.

Fix SCSS linting issues (#2207)

* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons

* Run stylelint --fix

* Avoid `@extend` directives with doodle modal CSS

* Drop use of `@extend` for notification cleanup buttons SCSS

* Run prettier on SCSS

Bump stylelint-config-standard-scss from 7.0.1 to 9.0.0 (#24755)

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Merge pull request #2198 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Fix pop-in player placeholder layout in thread view (#24715)

Fix audio player width in thread view (#24713)

Merge branch 'main' into glitch-soc/merge-upstream

Conflicts:
- `.github/dependabot.yml`:
  Updated upstream, removed in glitch-soc to disable noise.
  Kept removed.
- `CODE_OF_CONDUCT.md`:
  Upstream updated to a new version of the covenant, but I have not read it
  yet, so kept unchanged.
- `Gemfile.lock`:
  Not a real conflict, one upstream dependency updated textually too close to
  the glitch-soc only `hcaptcha` dependency.
  Applied upstream changes.
- `app/controllers/admin/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/application_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/disputes/base_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/relationships_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/controllers/statuses_cleanup_controller.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/helpers/application_helper.rb`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream added a highlight animation for onboarding, while we changed the
  max character limit.
  Applied our local changes on top of upstream's new version.
- `app/views/layouts/application.html.haml`:
  Minor conflict due to glitch-soc's theming system.
  Applied upstream changes.
- `stylelint.config.js`:
  Upstream added ignore paths, glitch-soc had extra ignore paths.
  Added the same paths as upstream.

Fix thread lines in right-to-left locales (#24714)

Fix wrong classes `audio` and `video` instead of `audio-player` and `video-player` in CSS (#24711)

Change logo version in header based on screen size in web UI (#24707)

Fix refering to unused `preview-card` CSS class instead of `status-card` (#24696)

Fix preview cards layout in thread view (#24677)

Fix sass warning about deprecated slash as division (#24653)

Co-authored-by: Nick Schonning <nschonni@gmail.com>

Add more tips to onboarding flow in web UI (#24646)

Add lines to threads in web UI (#24549)

Change styling of the recommended accounts to allow bio to be more visible  (#24480)

Use CSS to trim long card descriptions (#24265)

Add new onboarding flow to web UI (#24619)

Merge pull request #2192 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes