mirror of https://github.com/vector-im/riot-web
				
				
				
			
							parent
							
								
									03476705b1
								
							
						
					
					
						commit
						9399b7ddf0
					
				| 
						 | 
				
			
			@ -516,7 +516,6 @@ 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 }
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -36,7 +36,6 @@ 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,
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -172,7 +172,7 @@ hr.mx_RoomView_myReadMarker {
 | 
			
		|||
 | 
			
		||||
    max-height: 0px;
 | 
			
		||||
    background-color: $primary-bg-color;
 | 
			
		||||
    z-index: 5;
 | 
			
		||||
    z-index: 1000;
 | 
			
		||||
    overflow: hidden;
 | 
			
		||||
 | 
			
		||||
    -webkit-transition: all .2s ease-out;
 | 
			
		||||
| 
						 | 
				
			
			@ -260,4 +260,4 @@ hr.mx_RoomView_myReadMarker {
 | 
			
		|||
 | 
			
		||||
.mx_RoomView_ongoingConfCallNotification a {
 | 
			
		||||
    color: $accent-fg-color ! important;
 | 
			
		||||
}
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -25,8 +25,6 @@ limitations under the License.
 | 
			
		|||
    margin-top: -3px;
 | 
			
		||||
    margin-left: -20px;
 | 
			
		||||
    width: 200px;
 | 
			
		||||
    font-weight: initial;
 | 
			
		||||
    text-transform: initial;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
.mx_IncomingCallBox_chevron {
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue