Merge branch 'RC1-1.0' of https://github.com/havfo/multiparty-meeting into RC1-1.0

app/lib/components/Me.jsx

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

app/lib/store.js

@@ -18,7 +18,9 @@ if (process.env.NODE_ENV === 'development')
 {
 	const reduxLogger = createLogger(
 		{
-			predicate : (getState, action) => action.type !== 'SET_PRODUCER_VOLUME',
+			// filter VOLUME level actions from log
+			predicate : (getState, action) => ! (action.type == 'SET_PRODUCER_VOLUME'
+				|| action.type == 'SET_CONSUMER_VOLUME'),
 			duration  : true,
 			timestamp : false,
 			level     : 'log',

app/stylus/components/Me.styl

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