From c5d732a631aeacaaa38b02009b3128a5a6bf9c13 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 17 Jul 2020 15:56:58 -0600 Subject: [PATCH] IncomingCallBox2 -> IncomingCallBox --- res/css/views/voip/_CallContainer.scss | 8 ++++---- src/components/views/voip/CallContainer.tsx | 4 ++-- ...{IncomingCallBox2.tsx => IncomingCallBox.tsx} | 16 +++++++--------- 3 files changed, 13 insertions(+), 15 deletions(-) rename src/components/views/voip/{IncomingCallBox2.tsx => IncomingCallBox.tsx} (88%) diff --git a/res/css/views/voip/_CallContainer.scss b/res/css/views/voip/_CallContainer.scss index e13c851716..8d1b68dd99 100644 --- a/res/css/views/voip/_CallContainer.scss +++ b/res/css/views/voip/_CallContainer.scss @@ -36,12 +36,12 @@ limitations under the License. } } - .mx_IncomingCallBox2 { + .mx_IncomingCallBox { min-width: 250px; background-color: $primary-bg-color; padding: 8px; - .mx_IncomingCallBox2_CallerInfo { + .mx_IncomingCallBox_CallerInfo { display: flex; direction: row; @@ -68,12 +68,12 @@ limitations under the License. } } - .mx_IncomingCallBox2_buttons { + .mx_IncomingCallBox_buttons { padding: 8px; display: flex; flex-direction: row; - > .mx_IncomingCallBox2_spacer { + > .mx_IncomingCallBox_spacer { width: 8px; } diff --git a/src/components/views/voip/CallContainer.tsx b/src/components/views/voip/CallContainer.tsx index 6814332ed0..18a9c098d6 100644 --- a/src/components/views/voip/CallContainer.tsx +++ b/src/components/views/voip/CallContainer.tsx @@ -15,7 +15,7 @@ limitations under the License. */ import React from 'react'; -import IncomingCallBox2 from './IncomingCallBox2'; +import IncomingCallBox from './IncomingCallBox'; import CallPreview from './CallPreview'; import * as VectorConferenceHandler from '../../../VectorConferenceHandler'; @@ -30,7 +30,7 @@ interface IState { export default class CallContainer extends React.PureComponent { public render() { return
- +
; } diff --git a/src/components/views/voip/IncomingCallBox2.tsx b/src/components/views/voip/IncomingCallBox.tsx similarity index 88% rename from src/components/views/voip/IncomingCallBox2.tsx rename to src/components/views/voip/IncomingCallBox.tsx index 6dfcb4bcee..00d49b20f5 100644 --- a/src/components/views/voip/IncomingCallBox2.tsx +++ b/src/components/views/voip/IncomingCallBox.tsx @@ -16,8 +16,6 @@ See the License for the specific language governing permissions and limitations under the License. */ -// TODO: Rename on launch: https://github.com/vector-im/riot-web/issues/14231 - import React from 'react'; import {MatrixClientPeg} from '../../../MatrixClientPeg'; import dis from '../../../dispatcher/dispatcher'; @@ -35,7 +33,7 @@ interface IState { incomingCall: any; } -export default class IncomingCallBox2 extends React.Component { +export default class IncomingCallBox extends React.Component { private dispatcherRef: string; constructor(props: IProps) { @@ -106,8 +104,8 @@ export default class IncomingCallBox2 extends React.Component { } } - return
-
+ return
+
{

{incomingCallText}

-
+
-
+