mirror of https://github.com/vector-im/riot-web
fix incoming call box
parent
4864716abb
commit
b3431bb750
|
@ -515,6 +515,7 @@ var RoomSubList = React.createClass({
|
||||||
roomCount={ roomCount }
|
roomCount={ roomCount }
|
||||||
collapsed={ this.props.collapsed }
|
collapsed={ this.props.collapsed }
|
||||||
hidden={ this.state.hidden }
|
hidden={ this.state.hidden }
|
||||||
|
incomingCall={ this.props.incomingCall }
|
||||||
isIncomingCallRoom={ isIncomingCallRoom }
|
isIncomingCallRoom={ isIncomingCallRoom }
|
||||||
roomNotificationCount={ this.roomNotificationCount() }
|
roomNotificationCount={ this.roomNotificationCount() }
|
||||||
onClick={ this.onClick }
|
onClick={ this.onClick }
|
||||||
|
|
|
@ -36,6 +36,7 @@ module.exports = React.createClass({
|
||||||
React.PropTypes.number
|
React.PropTypes.number
|
||||||
]),
|
]),
|
||||||
collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?
|
collapsed: React.PropTypes.bool.isRequired, // is LeftPanel collapsed?
|
||||||
|
incomingCall: React.PropTypes.object,
|
||||||
isIncomingCallRoom: React.PropTypes.bool,
|
isIncomingCallRoom: React.PropTypes.bool,
|
||||||
roomNotificationCount: React.PropTypes.array,
|
roomNotificationCount: React.PropTypes.array,
|
||||||
hidden: React.PropTypes.bool,
|
hidden: React.PropTypes.bool,
|
||||||
|
|
|
@ -171,7 +171,7 @@ hr.mx_RoomView_myReadMarker {
|
||||||
|
|
||||||
max-height: 0px;
|
max-height: 0px;
|
||||||
background-color: $primary-bg-color;
|
background-color: $primary-bg-color;
|
||||||
z-index: 1000;
|
z-index: 5;
|
||||||
overflow: hidden;
|
overflow: hidden;
|
||||||
|
|
||||||
-webkit-transition: all .2s ease-out;
|
-webkit-transition: all .2s ease-out;
|
||||||
|
@ -259,4 +259,4 @@ hr.mx_RoomView_myReadMarker {
|
||||||
|
|
||||||
.mx_RoomView_ongoingConfCallNotification a {
|
.mx_RoomView_ongoingConfCallNotification a {
|
||||||
color: $accent-fg-color ! important;
|
color: $accent-fg-color ! important;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,6 +25,8 @@ limitations under the License.
|
||||||
margin-top: -3px;
|
margin-top: -3px;
|
||||||
margin-left: -20px;
|
margin-left: -20px;
|
||||||
width: 200px;
|
width: 200px;
|
||||||
|
font-weight: initial;
|
||||||
|
text-transform: initial;
|
||||||
}
|
}
|
||||||
|
|
||||||
.mx_IncomingCallBox_chevron {
|
.mx_IncomingCallBox_chevron {
|
||||||
|
|
Loading…
Reference in New Issue