Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix fading of screensharing.

master
Håvar Aambø Fosstveit 2019-11-26 13:28:28 +01:00
parent ff549a230d
commit 6e5300c937
2 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/src/components/Containers/Me.js
View File

@ -31,14 +31,6 @@ const styles = (theme) =>
backgroundPosition : 'bottom',
backgroundSize : 'auto 85%',
backgroundRepeat : 'no-repeat',
'&.webcam' :
{
order : 1
},
'&.screen' :
{
order : 2
},
'&.hover' :
{
boxShadow : '0px 1px 3px rgba(0, 0, 0, 0.05) inset, 0px 0px 8px rgba(82, 168, 236, 0.9)'
@ -53,6 +45,15 @@ const styles = (theme) =>
{
transition : 'filter 10s',
filter : 'grayscale(0.75)'
},
'&.webcam' :
{
order : 1
},
'&.screen' :
{
order : 2,
filter : 'grayscale(0)'
}
},
fab :

17
app/src/components/Containers/Peer.js
View File

@ -31,14 +31,6 @@ const styles = (theme) =>
backgroundPosition : 'bottom',
backgroundSize : 'auto 85%',
backgroundRepeat : 'no-repeat',
'&.webcam' :
{
order : 4
},
'&.screen' :
{
order : 3
},
'&.hover' :
{
boxShadow : '0px 1px 3px rgba(0, 0, 0, 0.05) inset, 0px 0px 8px rgba(82, 168, 236, 0.9)'
@ -53,6 +45,15 @@ const styles = (theme) =>
{
transition : 'filter 10s',
filter : 'grayscale(0.75)'
},
'&.webcam' :
{
order : 4
},
'&.screen' :
{
order : 3,
filter : 'grayscale(0)'
}
},
fab :