From f6690ad3bfc134e3b092323c5f33364c6fa2d44d Mon Sep 17 00:00:00 2001
From: David Baker <dave@matrix.org>
Date: Wed, 17 May 2017 10:11:10 +0100
Subject: [PATCH] Revert "Revert "fix incoming call box""
This reverts commit 9399b7ddf0cf7b272e527b9086fc6fe68db2e66d.
---
src/components/structures/RoomSubList.js | 1 +
src/components/structures/RoomSubListHeader.js | 1 +
.../vector/css/matrix-react-sdk/structures/_RoomView.scss | 4 ++--
.../css/matrix-react-sdk/views/voip/_IncomingCallbox.scss | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/components/structures/RoomSubList.js b/src/components/structures/RoomSubList.js
index f741a30f03..c315ae46e9 100644
--- a/src/components/structures/RoomSubList.js
+++ b/src/components/structures/RoomSubList.js
@@ -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 }
diff --git a/src/components/structures/RoomSubListHeader.js b/src/components/structures/RoomSubListHeader.js
index 5618b39b85..eb73f72162 100644
--- a/src/components/structures/RoomSubListHeader.js
+++ b/src/components/structures/RoomSubListHeader.js
@@ -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,
diff --git a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
index 3d5fe02963..e251ecd14c 100644
--- a/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
+++ b/src/skins/vector/css/matrix-react-sdk/structures/_RoomView.scss
@@ -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;
@@ -260,4 +260,4 @@ hr.mx_RoomView_myReadMarker {
.mx_RoomView_ongoingConfCallNotification a {
color: $accent-fg-color ! important;
-}
\ No newline at end of file
+}
diff --git a/src/skins/vector/css/matrix-react-sdk/views/voip/_IncomingCallbox.scss b/src/skins/vector/css/matrix-react-sdk/views/voip/_IncomingCallbox.scss
index 64eac25d01..e63814f545 100644
--- a/src/skins/vector/css/matrix-react-sdk/views/voip/_IncomingCallbox.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/voip/_IncomingCallbox.scss
@@ -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 {
--
GitLab