diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 12:07:50 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-29 12:07:50 +0200 |
commit | 48b8a1f414e3d8430bd797e3db298fc5355ace2d (patch) | |
tree | c7b84ed81fb99b51eb2596df8ac1663d1998fa89 /app/javascript/styles/mastodon-light/diff.scss | |
parent | 79725f659d5e9c449df0ff73f9363407a0a064bd (diff) | |
parent | 4500dc2385d8571c494ea0277fe4ca415a264404 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/status.rb - app/services/remove_status_service.rb - db/schema.rb All conflicts were due to the addition of a `deleted_at` attribute to Statuses and reworked database indexes.
Diffstat (limited to 'app/javascript/styles/mastodon-light/diff.scss')
-rw-r--r-- | app/javascript/styles/mastodon-light/diff.scss | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/javascript/styles/mastodon-light/diff.scss b/app/javascript/styles/mastodon-light/diff.scss index ee8a7d265..e7114ed07 100644 --- a/app/javascript/styles/mastodon-light/diff.scss +++ b/app/javascript/styles/mastodon-light/diff.scss @@ -104,7 +104,8 @@ html { .box-widget input[type="email"], .box-widget input[type="password"], .box-widget textarea, -.statuses-grid .detailed-status { +.statuses-grid .detailed-status, +.audio-player { border: 1px solid lighten($ui-base-color, 8%); } @@ -700,3 +701,10 @@ 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; +} |