diff --git a/skins/base/css/molecules/voip/IncomingCallbox.css b/skins/base/css/molecules/voip/IncomingCallbox.css index fd88ee27..2c57a327 100644 --- a/skins/base/css/molecules/voip/IncomingCallbox.css +++ b/skins/base/css/molecules/voip/IncomingCallbox.css @@ -13,3 +13,56 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. */ + +.mx_IncomingCallBox { + text-align: center; + border: 1px solid #a9dbf4; + border-radius: 8px; + background-color: #fff; + position: absolute; + z-index: 1000; + left: 235px; + top: 155px; + padding: 6px; +} + +.mx_IncomingCallBox_chevron { + padding: 12px; + position: absolute; + left: -21px; + top: 0px; +} + +.mx_IncomingCallBox_title { + padding: 6px; + font-weight: bold; +} + +.mx_IncomingCallBox_buttons { + display: table-row; +} + +.mx_IncomingCallBox_buttons_cell { + vertical-align: middle; + display: table-cell; + padding: 6px; + width: 50%; +} + +.mx_IncomingCallBox_buttons_decline, +.mx_IncomingCallBox_buttons_accept { + vertical-align: middle; + width: 80px; + height: 36px; + line-height: 36px; + border-radius: 36px; + color: #fff; +} + +.mx_IncomingCallBox_buttons_decline { + background-color: #f48080; +} + +.mx_IncomingCallBox_buttons_accept { + background-color: #80f480; +} diff --git a/skins/base/img/chevron-left.png b/skins/base/img/chevron-left.png new file mode 100644 index 00000000..12abcc26 Binary files /dev/null and b/skins/base/img/chevron-left.png differ diff --git a/skins/base/views/molecules/voip/IncomingCallBox.js b/skins/base/views/molecules/voip/IncomingCallBox.js index 5adc71af..4f152e44 100644 --- a/skins/base/views/molecules/voip/IncomingCallBox.js +++ b/skins/base/views/molecules/voip/IncomingCallBox.js @@ -17,7 +17,7 @@ limitations under the License. 'use strict'; var React = require('react'); -var classNames = require('classnames'); +var MatrixClientPeg = require("../../../../../src/MatrixClientPeg"); var IncomingCallBoxController = require( "../../../../../src/controllers/molecules/voip/IncomingCallBox" ); @@ -31,7 +31,7 @@ module.exports = React.createClass({ }, render: function() { - if (!this.state.incomingCallRoomId) { + if (!this.state.incomingCall || !this.state.incomingCall.roomId) { return (