mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Revert "fix incoming call box"

Browse source 
This reverts commit b3431bb750.
This commit is contained in:
David Baker 2017-05-16 16:35:17 +01:00
parent 03476705b1
commit 9399b7ddf0
4 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/components/structures/RoomSubList.js
View file

@ -516,7 +516,6 @@ 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 }

1
src/components/structures/RoomSubListHeader.js
View file

@ -36,7 +36,6 @@ 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,

2
src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
View file

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

2
src/skins/vector/css/matrix-react-sdk/views/voip/_IncomingCallbox.scss
View file

@ -25,8 +25,6 @@ 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 {