sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity

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

Browse source 
Conflicts:
- `app/controllers/activitypub/collections_controller.rb`:
  Conflict caused because we have additional code to make sure pinned
  local-only toots don't get rendered on the ActivityPub endpoints.
  Ported upstream changes.
This commit is contained in:
Thibaut Girka 2020-09-07 09:21:38 +02:00
commit e5f934ddf0
18 changed files with 128 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/javascript/styles/mastodon-light/diff.scss
View file

@ -256,14 +256,6 @@ html {
background: $ui-base-color;
}
.status.status-direct {
background: lighten($ui-base-color, 4%);
}
.focusable:focus .status.status-direct {
background: lighten($ui-base-color, 8%);
}
.detailed-status,
.detailed-status__action-bar {
background: $white;