Unfloyded/Legamunt
0
0
Fork 0
Code Activity

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

Browse source 
Conflicts:
- `app/javascript/mastodon/actions/compose.js`:
  Not a “real” conflict, but change too close to a change we made to
  fix the vanilla WebUI locally pushing authored local-only toots in the
  public TL view.
This commit is contained in:
Thibaut Girka 2020-07-22 13:38:17 +02:00
commit b9f351d845
90 changed files with 414 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -767,10 +767,3 @@ html {
.compose-form .compose-form__warning {
box-shadow: none;
}
.audio-player .video-player__controls button,
.audio-player .video-player__time-sep,
.audio-player .video-player__time-current,
.audio-player .video-player__time-total {
color: $primary-text-color;
}