Revert "Revert "fix incoming call box""

This reverts commit 9399b7ddf0.
This commit is contained in:
David Baker 2017-05-17 10:11:10 +01:00
parent b34b6eceed
commit f6690ad3bf
4 changed files with 6 additions and 2 deletions

View file

@ -516,6 +516,7 @@ var RoomSubList = React.createClass({
roomCount={ roomCount }
collapsed={ this.props.collapsed }
hidden={ this.state.hidden }
incomingCall={ this.props.incomingCall }
isIncomingCallRoom={ isIncomingCallRoom }
roomNotificationCount={ this.roomNotificationCount() }
onClick={ this.onClick }

View file

@ -36,6 +36,7 @@ module.exports = React.createClass({
React.PropTypes.number
]),
collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?
incomingCall: React.PropTypes.object,
isIncomingCallRoom: React.PropTypes.bool,
roomNotificationCount: React.PropTypes.array,
hidden: React.PropTypes.bool,

View file

@ -172,7 +172,7 @@ hr.mx_RoomView_myReadMarker {
max-height: 0px;
background-color: $primary-bg-color;
z-index: 1000;
z-index: 5;
overflow: hidden;
-webkit-transition: all .2s ease-out;

View file

@ -25,6 +25,8 @@ limitations under the License.
margin-top: -3px;
margin-left: -20px;
width: 200px;
font-weight: initial;
text-transform: initial;
}
.mx_IncomingCallBox_chevron {