Skip to content

Commit

Permalink
Revert "fix incoming call box"
Browse files Browse the repository at this point in the history
This reverts commit b3431bb.
  • Loading branch information
dbkr committed May 16, 2017
1 parent 0347670 commit 9399b7d
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion src/components/structures/RoomSubList.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
1 change: 0 additions & 1 deletion src/components/structures/RoomSubListHeader.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -260,4 +260,4 @@ hr.mx_RoomView_myReadMarker {

.mx_RoomView_ongoingConfCallNotification a {
color: $accent-fg-color ! important;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down

0 comments on commit 9399b7d

Please sign in to comment.