From 44ce76bcb10b1c5117d5f95f48234813fb610df9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0imon=20Brandner?= Date: Mon, 1 Aug 2022 18:56:59 +0200 Subject: [PATCH 01/20] Get volume button inline with design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Šimon Brandner --- src/button/Button.tsx | 8 ++++---- src/video-grid/VideoTile.jsx | 20 ++++++++++++++++---- src/video-grid/VideoTile.module.css | 17 ++++++++++++----- 3 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/button/Button.tsx b/src/button/Button.tsx index e993661..a119364 100644 --- a/src/button/Button.tsx +++ b/src/button/Button.tsx @@ -30,7 +30,7 @@ import { ReactComponent as SettingsIcon } from "../icons/Settings.svg"; import { ReactComponent as AddUserIcon } from "../icons/AddUser.svg"; import { ReactComponent as ArrowDownIcon } from "../icons/ArrowDown.svg"; import { TooltipTrigger } from "../Tooltip"; -import { ReactComponent as OverflowIcon } from "../icons/Overflow.svg"; +import { ReactComponent as AudioIcon } from "../icons/Audio.svg"; export type ButtonVariant = | "default" @@ -239,11 +239,11 @@ export function InviteButton({ ); } -export function OptionsButton(props: Omit) { +export function AudioButton(props: Omit) { return ( "Options"}> - ); diff --git a/src/video-grid/VideoTile.jsx b/src/video-grid/VideoTile.jsx index 206f8a4..286d301 100644 --- a/src/video-grid/VideoTile.jsx +++ b/src/video-grid/VideoTile.jsx @@ -20,7 +20,7 @@ import classNames from "classnames"; import styles from "./VideoTile.module.css"; import { ReactComponent as MicMutedIcon } from "../icons/MicMuted.svg"; import { ReactComponent as VideoMutedIcon } from "../icons/VideoMuted.svg"; -import { OptionsButton } from "../button/Button"; +import { AudioButton } from "../button/Button"; export const VideoTile = forwardRef( ( @@ -65,7 +65,13 @@ export const VideoTile = forwardRef( ) : ( (showName || audioMuted || (videoMuted && !noVideo)) && ( -
+
{audioMuted && !(videoMuted && !noVideo) && } {videoMuted && !noVideo && } {showName && {name}} @@ -73,8 +79,14 @@ export const VideoTile = forwardRef( ) )} {showOptions && ( -
- +
+
)}
)}