mastodon/app/javascript/styles/mastodon
Claire 3ef5f62abf Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream switched to pushing to both DockerHub and GitHub Container
  Repository, while glitch-soc was already pushing to the latter only.
  Updated our configuration to be slightly more consistent with upstream's
  naming and styling, but kept our behavior.
- `Gemfile.lock`:
  Updated dependencies textually too close to glitch-soc only hcaptcha
  dependency.
  Updated dependencies as upstream did.
- `README.md`:
  Upstream updated its README, but we have a completely different one.
  Kept our README, though it probably should be reworked at some point.
- `app/views/auth/sessions/two_factor.html.haml`:
  Minor style fix upstream that's on a line glitch-soc removed because
  of its different theming system.
  Kept our file as is.
- `spec/controllers/health_controller_spec.rb`:
  This file apparently did not exist upstream, upstream created it with
  different contents but it is functionally the same.
  Switched to upstream's version of the file.
- `spec/presenters/instance_presenter_spec.rb`:
  Upstream changed the specs around `GITHUB_REPOSITORY`, while glitch-soc
  had its own code because it's a fork and does not have the same default
  source URL.
  Took upstream's change, but with glitch-soc's repo as the default case.
- `yarn.lock`:
  Upstream dependencies textually too close to a glitch-soc only one.
  Updated dependencies as upstream did.
2023-03-15 09:16:10 +01:00
..
_mixins.scss Add logged-out access to the web UI (#18961) 2022-09-29 04:39:33 +02:00
about.scss Change about page to be mounted in the web UI (#19345) 2022-10-13 14:42:37 +02:00
accessibility.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
accounts.scss Revert "Revert "Change "Allow trends without prior review" setting to include statuses (#17977)"" 2022-11-12 10:17:22 +01:00
admin.scss Merge branch 'main' into glitch-soc/merge-upstream 2023-02-25 14:00:40 +01:00
basics.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01: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-03-15 09:16:10 +01:00
containers.scss Change public accounts pages to mount the web UI (#19319) 2022-10-20 14:35:29 +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 Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
forms.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
lists.scss Restore vanilla components 2017-11-17 19:29:16 -08:00
modal.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
polls.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
reset.scss Fix Firefox scrollbar color regression in #9210 (#9908) 2019-01-24 13:32:23 +01:00
rich_text.scss Add support for incoming rich text (#23913) 2023-03-03 20:19:29 +01:00
rtl.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
statuses.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
tables.scss Stick batch table toolbar to the top (#20442) 2022-11-13 21:02:28 +01:00
variables.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00
widgets.scss Upgrade to Stylelint 15 with Prettier (#23558) 2023-02-13 04:57:03 +01:00