From fe513859c02e1e33b6aaac87b157bade4ef0d545 Mon Sep 17 00:00:00 2001 From: Andrei Dekterev Date: Mon, 1 Aug 2022 14:24:57 +0400 Subject: [PATCH] fix(#1701): offset control panel --- .../components/Chapters/index.tsx | 2 +- .../components/Settings/styled.tsx | 2 +- src/features/StreamPlayer/styled.tsx | 60 ++++++++----------- 3 files changed, 26 insertions(+), 38 deletions(-) diff --git a/src/features/StreamPlayer/components/Chapters/index.tsx b/src/features/StreamPlayer/components/Chapters/index.tsx index a5491c41..39d72dd4 100644 --- a/src/features/StreamPlayer/components/Chapters/index.tsx +++ b/src/features/StreamPlayer/components/Chapters/index.tsx @@ -33,7 +33,7 @@ export const Chapters = ({ chapters, videoRef }: Props) => { ))} diff --git a/src/features/StreamPlayer/components/Settings/styled.tsx b/src/features/StreamPlayer/components/Settings/styled.tsx index df3333a1..1df22dad 100644 --- a/src/features/StreamPlayer/components/Settings/styled.tsx +++ b/src/features/StreamPlayer/components/Settings/styled.tsx @@ -12,7 +12,7 @@ export const SettingsButton = styled(ButtonBase)` ? css` width: 20px; height: 18px; - margin-left: 15px; + margin-left: 10px; cursor: pointer; ` : ''}; diff --git a/src/features/StreamPlayer/styled.tsx b/src/features/StreamPlayer/styled.tsx index 026438c7..77c305f9 100644 --- a/src/features/StreamPlayer/styled.tsx +++ b/src/features/StreamPlayer/styled.tsx @@ -1,29 +1,22 @@ -import styled, { css } from 'styled-components' +import styled, { css } from 'styled-components/macro' import { isMobileDevice } from 'config/userAgent' +import { devices } from 'config' -export const ControlsGradient = styled.div<{ isVisible?: boolean }>` +export const ControlsGradient = styled.div` background-image: url(/images/player-controls-gradient.png); bottom: 0; position: absolute; width: 100%; pointer-events: none; height: 145px; - - ${({ isVisible }) => (isMobileDevice - ? css` - height: 100%; - background: ${(isVisible - ? 'linear-gradient(0deg, rgba(0,0,0,0.7) 0%, rgba(0,0,0,0) 25%, rgba(0,0,0,0) 75%, rgba(0,0,0,0.7) 100%)' - : 'initial')} - ` : '')} ` type HoverStylesProps = { visible: boolean, } -export const hoverStyles = css` +const hoverStyles = css` transition: opacity 0.3s ease-in-out; ${({ visible }) => (visible ? css`opacity: 1;` @@ -120,12 +113,9 @@ export const PlayerWrapper = styled.div` padding-top: 56.25%; `} - ${isMobileDevice - ? css` - min-height: auto; - margin-bottom: 15px; - ` - : ''}; + ${devices.laptop} { + min-height: auto; + } ` type LoaderWrapperProps = { @@ -161,7 +151,7 @@ export const ButtonBase = styled.button` const sizes = { lg: 92, - sm: 29, + sm: 24, } type PlayStopProps = { @@ -186,8 +176,8 @@ export const PlayStop = styled(ButtonBase)` ${isMobileDevice ? css` - width: ${sizes.sm}px; - height: ${sizes.sm}px; + width: 20%; + height: 60%; margin-right: 0; padding: 0; ` @@ -258,24 +248,26 @@ export const Backward = styled(ButtonBase)` ${isMobileDevice ? css` - width: ${rewindButtonSizes.sides.sm}px; - height: ${rewindButtonSizes.sides.sm}px; - font-size: ${rewindButtonSizes.fontSizes.sm}px; + width: 15%; + font-size: 14px; + margin-right: 6px; ` : ''}; ` export const Forward = styled(Backward)` background-image: url(/images/player-forward.svg); - margin-left: 10px; - margin-right: 0; ` -export const PlaybackTime = styled.span` +type PlaybackTimeProps = { + width?: number, +} + +export const PlaybackTime = styled.span` + width: ${({ width = 130 }) => `${width}px`}; font-weight: 600; font-size: 16px; color: #fff; - margin-right: 10px; ${isMobileDevice ? css` @@ -307,7 +299,7 @@ export const CenterControls = styled.div` pointer-events: ${({ playing }) => (playing ? 'none' : 'auto')}; ${isMobileDevice ? css` - width: 135px; + width: 70%; ` : ''}; ` @@ -322,15 +314,11 @@ export const LiveBtn = styled(ButtonBase)` padding: 4.5px 8px; background-color: #CC0000; border-radius: 1.3px; -` -export const TeamsDetailsWrapper = styled.div` - position: absolute; - top: 20px; - left: 15px; - font-size: 16px; - color: #FFFFFF; - z-index: 50; + ${isMobileDevice + ? css` + ` + : ''}; ` export const ChaptersText = styled.span`