diff --git a/app/src/components/Containers/Me.js b/app/src/components/Containers/Me.js index e695aab..d192428 100644 --- a/app/src/components/Containers/Me.js +++ b/app/src/components/Containers/Me.js @@ -13,7 +13,6 @@ const styles = () => ({ root : { - display : 'flex', flexDirection : 'row', margin : 6, flex : '0 0 auto', @@ -32,8 +31,6 @@ const styles = () => viewContainer : { position : 'relative', - width : 'var(--me-width)', - height : 'var(--me-height)', '&.webcam' : { order : 2 diff --git a/app/src/components/Containers/Peer.js b/app/src/components/Containers/Peer.js index 2c0c9dd..d93cd03 100644 --- a/app/src/components/Containers/Peer.js +++ b/app/src/components/Containers/Peer.js @@ -54,7 +54,6 @@ const styles = (theme) => viewContainer : { position : 'relative', - flexGrow : 1, '&.webcam' : { order : 2 @@ -86,15 +85,16 @@ const styles = (theme) => }, videoInfo : { - top : 0, - bottom : 0, - left : 0, - right : 0, - display : 'flex', - flexDirection : 'column', - justifyContent : 'center', - alignItems : 'center', - '& p' : + position : 'absolute', + width : '100%', + height : '100%', + backgroundColor : 'rgba(0, 0, 0, 0.3)', + display : 'flex', + justifyContent : 'center', + alignItems : 'center', + padding : '0.4vmin', + zIndex : 21, + '& p' : { padding : '6px 12px', borderRadius : 6, @@ -195,22 +195,22 @@ const Peer = (props) => }, 2000); }} > - { videoVisible && !webcamConsumer.supported ? -
-

incompatible video

-
- :null - } +
+ { videoVisible && !webcamConsumer.supported ? +
+

incompatible video

+
+ :null + } - { !videoVisible ? -
-

this video is paused

-
- :null - } + { !videoVisible ? +
+

this video is paused

+
+ :null + } - { videoVisible && webcamConsumer.supported ? -
+ { videoVisible && webcamConsumer.supported ?
setWebcamHover(true)} @@ -281,22 +281,22 @@ const Peer = (props) =>
+ :null + } - - - -
- :null - } + + + +
{ screenConsumer ? diff --git a/app/src/components/MeetingViews/Democratic.js b/app/src/components/MeetingViews/Democratic.js index 0bf6e8e..ca91ad8 100644 --- a/app/src/components/MeetingViews/Democratic.js +++ b/app/src/components/MeetingViews/Democratic.js @@ -188,7 +188,7 @@ export default connect( prev.peers === next.peers && prev.producers === next.producers && prev.consumers === next.consumers && - prev.spotlights === next.spotlights + prev.room.spotlights === next.room.spotlights ); } }