catstodon/app/javascript/styles/mastodon
Claire 12b935fadf 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.
2023-04-29 10:44:56 +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 account header image missing in low-res (#24433) 2023-04-07 11:57:43 +02:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-04-09 11:45:08 +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 branch 'main' into glitch-soc/merge-upstream 2023-04-29 10:44:56 +02:00
containers.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
dashboard.scss Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +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 progress indicator to sign-up flow (#24545) 2023-04-16 07:01:24 +02:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +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 Refactor styles to use logical properties for positioning (#23944) 2023-03-27 10:56:25 +02:00
tables.scss Fix styling regressions from RTL layout refactor (#24415) 2023-04-04 16:48:34 +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