rzerres/element-call
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'livekit' into eslint-upgrade

Browse Source
This commit is contained in:
Robin
2023-10-11 10:30:57 -04:00
parent a7624806b2 17be0578bc
commit cc6f1f8631
100 changed files with 2600 additions and 9682 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video-grid/NewVideoGrid.module.css
View File

@@ -15,14 +15,11 @@ limitations under the License.
*/
.grid {
contain: strict;
contain: layout style;
position: relative;
flex-grow: 1;
margin-inline: var(--inline-content-inset);
padding-block-end: var(--footerHeight);
margin-block-start: var(--cpd-space-4x);
overflow-y: auto;
overflow-x: hidden;
margin-block: var(--cpd-space-4x);
}
.slots {

1
src/video-grid/VideoGrid.module.css
View File

@@ -19,5 +19,4 @@ limitations under the License.
overflow: hidden;
flex: 1;
touch-action: none;
margin-bottom: var(--footerHeight);
}

3
src/video-grid/VideoGrid.tsx
View File

@@ -39,6 +39,7 @@ import {
} from "@react-spring/web";
import useMeasure from "react-use-measure";
import { ResizeObserver as JuggleResizeObserver } from "@juggle/resize-observer";
import { logger } from "matrix-js-sdk/src/logger";
import styles from "./VideoGrid.module.css";
import { Layout } from "../room/LayoutToggle";
@@ -299,7 +300,7 @@ function getFreedomLayoutTilePositions(
}
if (tileCount > 12) {
console.warn("Over 12 tiles is not currently supported");
logger.warn("Over 12 tiles is not currently supported");
}
const { layoutDirection, itemGridRatio } = getGridLayout(

11
src/video-grid/VideoTile.module.css
View File

@@ -43,7 +43,8 @@ limitations under the License.
}
.videoTile.speaking {
outline: 4px solid var(--cpd-color-border-accent);
/* !important because speaking border should take priority over hover */
outline: 4px solid var(--cpd-color-border-accent) !important;
}
@media (hover: hover) {
@@ -70,8 +71,7 @@ limitations under the License.
padding: var(--cpd-space-1x);
padding-block: var(--cpd-space-1x);
color: var(--cpd-color-text-primary);
/* TODO: un-hardcode this color. It comes from the dark theme. */
background-color: rgba(237, 244, 252, 0.79);
background-color: var(--cpd-color-bg-canvas-default);
display: flex;
align-items: center;
border-radius: var(--cpd-radius-pill-effect);
@@ -82,11 +82,6 @@ limitations under the License.
box-shadow: var(--small-drop-shadow);
}
:global(.cpd-theme-dark) .nameTag {
/* TODO: un-hardcode this color. It comes from the light theme. */
background-color: rgba(2, 7, 13, 0.77);
}
.nameTag > svg {
flex-shrink: 0;
}

4
src/video-grid/VideoTile.tsx
View File

@@ -34,8 +34,8 @@ import {
RoomMember,
RoomMemberEvent,
} from "matrix-js-sdk/src/models/room-member";
import { ReactComponent as MicOnSolidIcon } from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg";
import { ReactComponent as MicOffSolidIcon } from "@vector-im/compound-design-tokens/icons/mic-off-solid.svg";
import MicOnSolidIcon from "@vector-im/compound-design-tokens/icons/mic-on-solid.svg?react";
import MicOffSolidIcon from "@vector-im/compound-design-tokens/icons/mic-off-solid.svg?react";
import { Text } from "@vector-im/compound-web";
import { Avatar } from "../Avatar";