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

Muted controls on Me.jsx don't fade out anymore

master
Stefan Otto 2018-11-20 13:13:02 +01:00
parent 5c768e1ae6
commit 02af6627ca
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/lib/components/Me.jsx
View File

@ -108,13 +108,11 @@ class Me extends React.Component
> >
<div className={classnames('view-container', 'webcam')}> <div className={classnames('view-container', 'webcam')}>
{connected ? {connected ?
<div className={classnames('controls', { <div className={classnames('controls', 'visible')}>
visible : this.state.controlsVisible
})}
>
<div <div
className={classnames('button', 'mic', micState, { className={classnames('button', 'mic', micState, {
disabled : me.audioInProgress disabled : me.audioInProgress,
visible : micState == 'off' || this.state.controlsVisible
})} })}
onClick={() => onClick={() =>
{ {
@ -124,7 +122,8 @@ class Me extends React.Component
<div <div
className={classnames('button', 'webcam', webcamState, { className={classnames('button', 'webcam', webcamState, {
disabled : me.webcamInProgress disabled : me.webcamInProgress,
visible : webcamState == 'off' || this.state.controlsVisible
})} })}
onClick={() => onClick={() =>
{ {

6
app/stylus/components/Me.styl
View File

@ -43,13 +43,17 @@
background-repeat: no-repeat; background-repeat: no-repeat;
background-color: rgba(#000, 0.5); background-color: rgba(#000, 0.5);
cursor: pointer; cursor: pointer;
opacity: 0;
transition-property: opacity, background-color; transition-property: opacity, background-color;
transition-duration: 0.15s; transition-duration: 0.15s;
&.visible {
opacity: 0.85;
}
+desktop() { +desktop() {
width: 24px; width: 24px;
height: 24px; height: 24px;
opacity: 0.85;
&:hover { &:hover {
opacity: 1; opacity: 1;