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

Conflicts:
- `README.md`:
  Upstream updated its README, while we have a completely different one.
  Kept our README.
- `app/controllers/concerns/web_app_controller_concern.rb`:
  Conflict because of glitch-soc's theming system.
  Additionally, glitch-soc has different behavior regarding moved accounts.
  Ported some of the changes, but kept our overall behavior.
- `app/javascript/packs/admin.js`:
  Code changes actually applied to `app/javascript/core/admin.js`
This commit is contained in:
Claire
2023-01-05 14:16:25 +01:00
47 changed files with 357 additions and 327 deletions

View File

@ -4268,7 +4268,7 @@ a.status-card.compact:hover {
}
@keyframes heartbeat {
from {
0% {
transform: scale(1);
animation-timing-function: ease-out;
}
@ -7343,7 +7343,7 @@ noscript {
path:first-child {
fill: rgba($highlight-text-color, 0.25) !important;
fill-opacity: 100% !important;
fill-opacity: 1 !important;
}
path:last-child {