Merge remote-tracking branch 'upstream/dbkr/matrixrtcsession' into SimonBrandner/feat/e2ee-embeded

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
This commit is contained in:
Šimon Brandner
2023-09-04 16:10:15 +02:00
45 changed files with 2866 additions and 2131 deletions

View File

@@ -15,7 +15,7 @@ limitations under the License.
*/
.inspector {
background-color: var(--system);
background-color: var(--cpd-color-bg-subtle-secondary);
}
.scrollContainer {
@@ -36,6 +36,6 @@ limitations under the License.
.sequenceDiagramViewer :global(.messageText) {
font-size: var(--font-size-caption);
fill: var(--primary-content) !important;
stroke: var(--primary-content) !important;
fill: var(--cpd-color-text-primary) !important;
stroke: var(--cpd-color-text-primary) !important;
}

View File

@@ -280,7 +280,6 @@ export function GroupCallView({
<ActiveCall
client={client}
rtcSession={rtcSession}
memberships={memberships}
onLeave={onLeave}
hideHeader={hideHeader}
muteStates={muteStates}

View File

@@ -57,14 +57,14 @@ limitations under the License.
background: linear-gradient(
360deg,
#15191e 0%,
rgba(21, 25, 30, 0.9) 37%,
rgba(21, 25, 30, 0.8) 49.68%,
rgba(21, 25, 30, 0.7) 56.68%,
rgba(21, 25, 30, 0.427397) 72.92%,
rgba(21, 25, 30, 0.257534) 81.06%,
rgba(21, 25, 30, 0.136986) 87.29%,
rgba(21, 25, 30, 0.0658079) 92.4%,
rgba(21, 25, 30, 0) 100%
rgba(16, 19, 23, 0.9) 37%,
rgba(16, 19, 23, 0.8) 49.68%,
rgba(16, 19, 23, 0.7) 56.68%,
rgba(16, 19, 23, 0.427397) 72.92%,
rgba(16, 19, 23, 0.257534) 81.06%,
rgba(16, 19, 23, 0.136986) 87.29%,
rgba(16, 19, 23, 0.0658079) 92.4%,
rgba(16, 19, 23, 0) 100%
);
}

View File

@@ -35,7 +35,6 @@ import { OverlayTriggerState } from "@react-stately/overlays";
import { JoinRule } from "matrix-js-sdk/src/@types/partials";
import { logger } from "matrix-js-sdk/src/logger";
import { MatrixRTCSession } from "matrix-js-sdk/src/matrixrtc/MatrixRTCSession";
import { CallMembership } from "matrix-js-sdk/src/matrixrtc/CallMembership";
import type { IWidgetApiRequest } from "matrix-widget-api";
import {
@@ -120,7 +119,6 @@ export interface InCallViewProps {
rtcSession: MatrixRTCSession;
livekitRoom: Room;
muteStates: MuteStates;
memberships: CallMembership[];
onLeave: (error?: Error) => void;
hideHeader: boolean;
otelGroupCallMembership?: OTelGroupCallMembership;
@@ -132,7 +130,6 @@ export function InCallView({
rtcSession,
livekitRoom,
muteStates,
memberships,
onLeave,
hideHeader,
otelGroupCallMembership,

View File

@@ -20,7 +20,7 @@ limitations under the License.
height: 50vh;
border-radius: 24px;
overflow: hidden;
background-color: var(--bgColor3);
background-color: var(--stopgap-bgColor3);
margin: 20px;
}
@@ -41,7 +41,7 @@ limitations under the License.
display: flex;
justify-content: center;
align-items: center;
background-color: var(--bgColor3);
background-color: var(--stopgap-bgColor3);
}
.cameraPermissions {
@@ -62,7 +62,7 @@ limitations under the License.
display: flex;
justify-content: center;
align-items: center;
background-color: rgba(23, 25, 28, 0.9);
background-color: var(--stopgap-background-85);
}
.previewButtons > * {