From 02c20896487a5a23d300f7d4fb698f4a0e8c93bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5var=20Aamb=C3=B8=20Fosstveit?= Date: Tue, 26 Nov 2019 13:32:15 +0100 Subject: [PATCH] Combine CSS selectors. --- app/src/components/Containers/Me.js | 5 ++--- app/src/components/Containers/Peer.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js index b05b7f8..d5e860c 100644 --- a/app/src/components/Containers/Me.js +++ b/app/src/components/Containers/Me.js @@ -41,7 +41,7 @@ const styles = (theme) => filter : 'grayscale(0)', borderColor : 'var(--active-speaker-border-color)' }, - '&:not(.active-speaker)' : + '&:not(.active-speaker):not(.screen)' : { transition : 'filter 10s', filter : 'grayscale(0.75)' @@ -52,8 +52,7 @@ const styles = (theme) => }, '&.screen' : { - order : 2, - filter : 'grayscale(0)' + order : 2 } }, fab : diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js index fbaa878..557a316 100644 --- a/app/src/components/Containers/Peer.js +++ b/app/src/components/Containers/Peer.js @@ -41,7 +41,7 @@ const styles = (theme) => filter : 'grayscale(0)', borderColor : 'var(--active-speaker-border-color)' }, - '&:not(.active-speaker)' : + '&:not(.active-speaker):not(.screen)' : { transition : 'filter 10s', filter : 'grayscale(0.75)' @@ -52,8 +52,7 @@ const styles = (theme) => }, '&.screen' : { - order : 3, - filter : 'grayscale(0)' + order : 3 } }, fab :