From 9bdad8f14e145440fea0a49a4c8af0233e093bd2 Mon Sep 17 00:00:00 2001 From: ThibG Date: Fri, 17 Jul 2020 07:07:18 +0200 Subject: [Glitch] Fix audio player controls color in mastodon-light theme Port 85bc0f9639c9c1ecccfa6963929b6c405fb8452c to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/mastodon-light/diff.scss | 7 ------- 1 file changed, 7 deletions(-) (limited to 'app/javascript/flavours') 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; -} -- cgit From 4412e2579c38ab32f698a28d0d9a6f4771b09c79 Mon Sep 17 00:00:00 2001 From: Sasha Sorokin Date: Fri, 17 Jul 2020 12:08:23 +0700 Subject: [Glitch] Fix following_counter plural to include "one" Port 17b1d71536609c6deabcf3b13ec9be0ec9fd793f to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/components/common_counter.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours') 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) => ( Date: Sat, 18 Jul 2020 18:55:36 +0200 Subject: [Glitch] Fix keyboard navigation in scrollable lists Port 98f6380dee5c93d9cdc4d94ec81d31a3bfa0a943 to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/components/scrollable_list.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/javascript/flavours') 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 = { -- cgit From 855ada7e93cefdee61e25cc6b4770338e4a7e3ed Mon Sep 17 00:00:00 2001 From: Thibaut Girka Date: Wed, 22 Jul 2020 21:23:41 +0200 Subject: Fix “Show less for all”/”Show more for all” eye icon not reflecting state MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/javascript/flavours/glitch/features/status/index.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/features/status/index.js b/app/javascript/flavours/glitch/features/status/index.js index a9abc545e..3e2e95f35 100644 --- a/app/javascript/flavours/glitch/features/status/index.js +++ b/app/javascript/flavours/glitch/features/status/index.js @@ -557,7 +557,7 @@ class Status extends ImmutablePureComponent { showBackButton multiColumn={multiColumn} extraButton={( - + )} /> @@ -566,7 +566,7 @@ class Status extends ImmutablePureComponent { {ancestors} -
+
Date: Wed, 22 Jul 2020 22:48:51 +0200 Subject: [Glitch] Change disabled retweet icon Port e93efc03092c4292658543695810036bc52bbc7f to glitch-soc Signed-off-by: Thibaut Girka --- app/javascript/flavours/glitch/styles/components/boost.scss | 9 +-------- app/javascript/flavours/glitch/styles/components/index.scss | 12 ++++-------- 2 files changed, 5 insertions(+), 16 deletions(-) (limited to 'app/javascript/flavours') diff --git a/app/javascript/flavours/glitch/styles/components/boost.scss b/app/javascript/flavours/glitch/styles/components/boost.scss index f1ad041e9..2d307765c 100644 --- a/app/javascript/flavours/glitch/styles/components/boost.scss +++ b/app/javascript/flavours/glitch/styles/components/boost.scss @@ -9,13 +9,6 @@ button.icon-button i.fa-retweet { // Disabled variant button.icon-button.disabled i.fa-retweet { &, &:hover { - background-image: url("data:image/svg+xml;utf8,"); - } -} - -// Disabled variant for use with DMs -.status-direct button.icon-button.disabled i.fa-retweet { - &, &:hover { - background-image: url("data:image/svg+xml;utf8,"); + background-image: url("data:image/svg+xml;utf8,"); } } diff --git a/app/javascript/flavours/glitch/styles/components/index.scss b/app/javascript/flavours/glitch/styles/components/index.scss index a37cef795..843f40ec0 100644 --- a/app/javascript/flavours/glitch/styles/components/index.scss +++ b/app/javascript/flavours/glitch/styles/components/index.scss @@ -1038,7 +1038,7 @@ } } -.no-reduce-motion button.icon-button i.fa-retweet { +button.icon-button i.fa-retweet { background-position: 0 0; height: 19px; transition: background-position 0.9s steps(10); @@ -1051,18 +1051,14 @@ } } -.no-reduce-motion button.icon-button.active i.fa-retweet { +button.icon-button.active i.fa-retweet { transition-duration: 0.9s; background-position: 0 100%; } -.reduce-motion button.icon-button i.fa-retweet { - color: $action-button-color; - transition: color 100ms ease-in; -} - +.reduce-motion button.icon-button i.fa-retweet, .reduce-motion button.icon-button.active i.fa-retweet { - color: $highlight-text-color; + transition: none; } .reduce-motion button.icon-button.disabled i.fa-retweet { -- cgit