Style tweaks
This commit is contained in:
parent
2ad093d3e3
commit
307588dd31
11 changed files with 59 additions and 66 deletions
|
@ -14,11 +14,11 @@ import {
|
||||||
const Container = styled.div`
|
const Container = styled.div`
|
||||||
background-color: transparent;
|
background-color: transparent;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
position: absolute;
|
position: fixed;
|
||||||
left: 0;
|
left: 0;
|
||||||
right: 0;
|
right: 0;
|
||||||
top: 10px;
|
top: 12px;
|
||||||
bottom: 8px;
|
bottom: 0px;
|
||||||
z-index: ${panelZIndexes.propsPanel};
|
z-index: ${panelZIndexes.propsPanel};
|
||||||
|
|
||||||
&:before {
|
&:before {
|
||||||
|
@ -36,30 +36,39 @@ const Container = styled.div`
|
||||||
const Content = styled.div`
|
const Content = styled.div`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
bottom: 0;
|
|
||||||
right: 0;
|
right: 0;
|
||||||
width: 320px;
|
width: 300px;
|
||||||
overflow-y: hidden;
|
bottom: 0;
|
||||||
display: flex;
|
/* transform: translateX(100%); */
|
||||||
flex-direction: column;
|
/* pointer-events: none; */
|
||||||
transform: translateX(100%);
|
|
||||||
pointer-events: auto;
|
|
||||||
|
|
||||||
${Container}:hover & {
|
${Container}:hover & {
|
||||||
transform: translateX(0);
|
transform: translateX(0);
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
const Title = styled.div`
|
const Title = styled.div``
|
||||||
width: 100%;
|
|
||||||
`
|
const headerHeight = `32px`
|
||||||
|
|
||||||
const Header = styled.div`
|
const Header = styled.div`
|
||||||
display: none;
|
height: ${headerHeight};
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
position: absolute;
|
||||||
|
top: 0;
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
`
|
`
|
||||||
|
|
||||||
const Body = styled.div`
|
const Body = styled.div`
|
||||||
flex-grow: 1;
|
pointer-events: auto;
|
||||||
|
position: absolute;
|
||||||
|
top: ${headerHeight};
|
||||||
|
left: 0;
|
||||||
|
right: 0;
|
||||||
|
height: auto;
|
||||||
|
max-height: calc(100% - ${headerHeight});
|
||||||
overflow-y: scroll;
|
overflow-y: scroll;
|
||||||
padding: 0;
|
padding: 0;
|
||||||
`
|
`
|
||||||
|
|
|
@ -19,7 +19,8 @@ import DefaultOrStaticValueIndicator from './utils/DefaultValueIndicator'
|
||||||
|
|
||||||
const Container = styled.div`
|
const Container = styled.div`
|
||||||
--step: 8px;
|
--step: 8px;
|
||||||
--left-pad: 18px;
|
--left-pad: 0px;
|
||||||
|
pointer-events: auto;
|
||||||
`
|
`
|
||||||
|
|
||||||
const Header = styled.div`
|
const Header = styled.div`
|
||||||
|
|
|
@ -43,6 +43,7 @@ const Row = styled.div`
|
||||||
align-items: stretch;
|
align-items: stretch;
|
||||||
--right-width: 60%;
|
--right-width: 60%;
|
||||||
position: relative;
|
position: relative;
|
||||||
|
pointer-events: auto;
|
||||||
|
|
||||||
${rowBg};
|
${rowBg};
|
||||||
`
|
`
|
||||||
|
@ -69,6 +70,8 @@ const PropNameContainer = styled.div`
|
||||||
text-overflow: ellipsis;
|
text-overflow: ellipsis;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
|
user-select: none;
|
||||||
|
cursor: default;
|
||||||
|
|
||||||
${propNameText};
|
${propNameText};
|
||||||
`
|
`
|
||||||
|
|
|
@ -120,7 +120,7 @@ const Tooltip = styled.div`
|
||||||
font-size: 10px;
|
font-size: 10px;
|
||||||
line-height: 18px;
|
line-height: 18px;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
${Thumb}:hover & {
|
${Thumb}:hover &, ${Container}.seeking & {
|
||||||
display: block;
|
display: block;
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
@ -152,6 +152,7 @@ const Playhead: React.FC<{layoutP: Pointer<SequenceEditorPanelLayout>}> = ({
|
||||||
onDragEnd() {
|
onDragEnd() {
|
||||||
setIsSeeking(false)
|
setIsSeeking(false)
|
||||||
},
|
},
|
||||||
|
lockCursorTo: 'ew-resize',
|
||||||
}
|
}
|
||||||
}, [])
|
}, [])
|
||||||
|
|
||||||
|
@ -175,6 +176,7 @@ const Playhead: React.FC<{layoutP: Pointer<SequenceEditorPanelLayout>}> = ({
|
||||||
<Container
|
<Container
|
||||||
isVisible={isVisible}
|
isVisible={isVisible}
|
||||||
style={{transform: `translate3d(${posInClippedSpace}px, 0, 0)`}}
|
style={{transform: `translate3d(${posInClippedSpace}px, 0, 0)`}}
|
||||||
|
className={isSeeking ? 'seeking' : ''}
|
||||||
>
|
>
|
||||||
<Thumb ref={thumbRef as $IntentionalAny}>
|
<Thumb ref={thumbRef as $IntentionalAny}>
|
||||||
<RoomToClick room={8} />
|
<RoomToClick room={8} />
|
||||||
|
|
|
@ -4,6 +4,7 @@ import React from 'react'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout'
|
import type {SequenceEditorPanelLayout} from '@theatre/studio/panels/SequenceEditorPanel/layout/layout'
|
||||||
import StampsGrid from '@theatre/studio/panels/SequenceEditorPanel/FrameGrid/StampsGrid'
|
import StampsGrid from '@theatre/studio/panels/SequenceEditorPanel/FrameGrid/StampsGrid'
|
||||||
|
import PanelDragZone from '@theatre/studio/panels/BasePanel/PanelDragZone'
|
||||||
|
|
||||||
const height = 20
|
const height = 20
|
||||||
|
|
||||||
|
@ -12,7 +13,7 @@ export const topStripTheme = {
|
||||||
borderColor: `#1c1e21`,
|
borderColor: `#1c1e21`,
|
||||||
}
|
}
|
||||||
|
|
||||||
const Container = styled.div`
|
const Container = styled(PanelDragZone)`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
|
@ -21,6 +22,7 @@ const Container = styled.div`
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
background: ${topStripTheme.backgroundColor};
|
background: ${topStripTheme.backgroundColor};
|
||||||
border-bottom: 1px solid ${topStripTheme.borderColor};
|
border-bottom: 1px solid ${topStripTheme.borderColor};
|
||||||
|
pointer-events: auto;
|
||||||
`
|
`
|
||||||
|
|
||||||
const TopStrip: React.FC<{layoutP: Pointer<SequenceEditorPanelLayout>}> = ({
|
const TopStrip: React.FC<{layoutP: Pointer<SequenceEditorPanelLayout>}> = ({
|
||||||
|
|
|
@ -11,10 +11,12 @@ const Container = styled.div`
|
||||||
top: 12px;
|
top: 12px;
|
||||||
right: 12px;
|
right: 12px;
|
||||||
left: 12px;
|
left: 12px;
|
||||||
|
height: 28px;
|
||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
|
|
||||||
display: flex;
|
display: flex;
|
||||||
gap: 1rem;
|
gap: 1rem;
|
||||||
|
justify-content: center;
|
||||||
`
|
`
|
||||||
|
|
||||||
const GlobalToolbar: React.FC<{}> = (props) => {
|
const GlobalToolbar: React.FC<{}> = (props) => {
|
||||||
|
|
|
@ -1,23 +0,0 @@
|
||||||
import type {VFC} from 'react'
|
|
||||||
import React from 'react'
|
|
||||||
import {Tooltip as TooltipImpl, TooltipReference, useTooltipState} from 'reakit'
|
|
||||||
import type {TooltipProps} from 'reakit'
|
|
||||||
import styled from 'styled-components'
|
|
||||||
|
|
||||||
export {TooltipReference, useTooltipState}
|
|
||||||
|
|
||||||
const Container = styled(TooltipImpl)`
|
|
||||||
padding: 8px 14px;
|
|
||||||
|
|
||||||
font-size: 11px;
|
|
||||||
line-height: 1.25em;
|
|
||||||
border-radius: 2px;
|
|
||||||
background-color: #201f20;
|
|
||||||
color: white;
|
|
||||||
pointer-events: none;
|
|
||||||
font-weight: 500;
|
|
||||||
`
|
|
||||||
|
|
||||||
export const Tooltip: VFC<TooltipProps> = ({className, ...props}) => (
|
|
||||||
<Container {...props} className={className as string} />
|
|
||||||
)
|
|
|
@ -2,7 +2,7 @@ import type {ElementType} from 'react'
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
|
|
||||||
export const height = 30
|
export const height = 26
|
||||||
|
|
||||||
const Container = styled.li`
|
const Container = styled.li`
|
||||||
height: ${height}px;
|
height: ${height}px;
|
||||||
|
@ -10,10 +10,22 @@ const Container = styled.li`
|
||||||
margin: 0;
|
margin: 0;
|
||||||
display: flex;
|
display: flex;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
font-weight: 600;
|
font-size: 11px;
|
||||||
|
font-weight: 400;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
&:hover {
|
&:after {
|
||||||
background: #2bb5de;
|
position: absolute;
|
||||||
|
inset: 2px 1px;
|
||||||
|
display: block;
|
||||||
|
content: ' ';
|
||||||
|
pointer-events: none;
|
||||||
|
z-index: -1;
|
||||||
|
border-radius: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&:hover:after {
|
||||||
|
background-color: rgba(63, 174, 191, 0.75);
|
||||||
}
|
}
|
||||||
`
|
`
|
||||||
|
|
||||||
|
|
|
@ -19,14 +19,15 @@ const Container = styled.ul`
|
||||||
position: absolute;
|
position: absolute;
|
||||||
min-width: ${minWidth}px;
|
min-width: ${minWidth}px;
|
||||||
z-index: 10000;
|
z-index: 10000;
|
||||||
background: ${transparentize(0.1, '#111')};
|
background: ${transparentize(0.2, '#111')};
|
||||||
color: white;
|
color: white;
|
||||||
list-style-type: none;
|
list-style-type: none;
|
||||||
padding: 2px;
|
padding: 2px 0;
|
||||||
margin: 0;
|
margin: 0;
|
||||||
border-radius: 1px;
|
border-radius: 1px;
|
||||||
cursor: default;
|
cursor: default;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
|
border-radius: 3px;
|
||||||
`
|
`
|
||||||
|
|
||||||
export type IContextMenuItem = {
|
export type IContextMenuItem = {
|
||||||
|
|
|
@ -1,19 +1,13 @@
|
||||||
import type {ReactElement} from 'react'
|
import type {ReactElement} from 'react'
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
import {
|
|
||||||
Tooltip,
|
|
||||||
TooltipReference,
|
|
||||||
useTooltipState,
|
|
||||||
} from '@theatre/studio/uiComponents/Tooltip'
|
|
||||||
import type {ButtonProps} from 'reakit'
|
import type {ButtonProps} from 'reakit'
|
||||||
import {Button} from 'reakit'
|
|
||||||
import {outlinePanelTheme} from '@theatre/studio/panels/OutlinePanel/BaseItem'
|
import {outlinePanelTheme} from '@theatre/studio/panels/OutlinePanel/BaseItem'
|
||||||
import {darken, opacify} from 'polished'
|
import {darken, opacify} from 'polished'
|
||||||
|
|
||||||
const {baseBg, baseBorderColor, baseFontColor} = outlinePanelTheme
|
const {baseBg, baseBorderColor, baseFontColor} = outlinePanelTheme
|
||||||
|
|
||||||
export const TheButton = styled(TooltipReference)`
|
export const TheButton = styled.button`
|
||||||
pointer-events: auto;
|
pointer-events: auto;
|
||||||
position: relative;
|
position: relative;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
@ -66,18 +60,11 @@ const ToolbarIconButton: React.FC<
|
||||||
label: string
|
label: string
|
||||||
}
|
}
|
||||||
> = ({label, icon, ...props}) => {
|
> = ({label, icon, ...props}) => {
|
||||||
const tooltip = useTooltipState()
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<TheButton
|
<TheButton aria-label={label} onClick={props.onClick} title={label}>
|
||||||
{...tooltip}
|
|
||||||
forwardedAs={Button}
|
|
||||||
aria-label={label}
|
|
||||||
onClick={props.onClick}
|
|
||||||
>
|
|
||||||
{icon}
|
{icon}
|
||||||
</TheButton>
|
</TheButton>
|
||||||
<Tooltip {...tooltip}>{label}</Tooltip>
|
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,7 +3,6 @@ import React from 'react'
|
||||||
import type {IconType} from 'react-icons'
|
import type {IconType} from 'react-icons'
|
||||||
import {Group, Button} from 'reakit'
|
import {Group, Button} from 'reakit'
|
||||||
import styled from 'styled-components'
|
import styled from 'styled-components'
|
||||||
import {Tooltip, useTooltipState} from '@theatre/studio/uiComponents/Tooltip'
|
|
||||||
import {TheButton as ButtonImpl} from './ToolbarIconButton'
|
import {TheButton as ButtonImpl} from './ToolbarIconButton'
|
||||||
|
|
||||||
const Opt = styled(ButtonImpl)``
|
const Opt = styled(ButtonImpl)``
|
||||||
|
@ -21,19 +20,17 @@ function OptionButton<T>({
|
||||||
onClick: () => void
|
onClick: () => void
|
||||||
isSelected: boolean
|
isSelected: boolean
|
||||||
}) {
|
}) {
|
||||||
const tooltip = useTooltipState()
|
|
||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
<Opt
|
<Opt
|
||||||
{...tooltip}
|
|
||||||
forwardedAs={Button}
|
forwardedAs={Button}
|
||||||
className={isSelected ? 'selected' : undefined}
|
className={isSelected ? 'selected' : undefined}
|
||||||
aria-label={label}
|
aria-label={label}
|
||||||
onClick={onClick}
|
onClick={onClick}
|
||||||
|
title={label}
|
||||||
>
|
>
|
||||||
{icon}
|
{icon}
|
||||||
</Opt>
|
</Opt>
|
||||||
<Tooltip {...tooltip}>{label}</Tooltip>
|
|
||||||
</>
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue