diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-22 15:39:36 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-22 15:39:36 +0200 |
| commit | 4024952b58bacb94d2cb43fafddf0e97bea4c55c (patch) | |
| tree | b1c1e5cdb84606879d65ecceebe4cf665332379b /app/javascript/flavours/glitch | |
| parent | 801e546ecc1efb4103232d8265229eb455a8dd5b (diff) | |
| parent | f8e315cd74d05a6878bbd018b20462daa0b5e660 (diff) | |
Merge pull request #1385 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/javascript/flavours/glitch')
3 files changed, 2 insertions, 9 deletions
diff --git a/app/javascript/flavours/glitch/components/common_counter.js b/app/javascript/flavours/glitch/components/common_counter.js index 4fdf3babf..e10cd9b76 100644 --- a/app/javascript/flavours/glitch/components/common_counter.js +++ b/app/javascript/flavours/glitch/components/common_counter.js @@ -37,7 +37,7 @@ export function counterRenderer(counterType, isBold = true) { return (displayNumber, pluralReady) => ( <FormattedMessage id='account.following_counter' - defaultMessage='{count, plural, other {{counter} Following}}' + defaultMessage='{count, plural, one {{counter} Following} other {{counter} Following}}' values={{ count: pluralReady, counter: renderCounter(displayNumber), diff --git a/app/javascript/flavours/glitch/components/scrollable_list.js b/app/javascript/flavours/glitch/components/scrollable_list.js index 5d10ed650..cc8d9f1f3 100644 --- a/app/javascript/flavours/glitch/components/scrollable_list.js +++ b/app/javascript/flavours/glitch/components/scrollable_list.js @@ -20,7 +20,7 @@ const mapStateToProps = (state, { scrollKey }) => { }; }; -export default @connect(mapStateToProps) +export default @connect(mapStateToProps, null, null, { forwardRef: true }) class ScrollableList extends PureComponent { static contextTypes = { diff --git a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss index 3b4ffdf3c..c83c82766 100644 --- a/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss +++ b/app/javascript/flavours/glitch/styles/mastodon-light/diff.scss @@ -385,10 +385,3 @@ .directory__tag > div { 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; -} |