variablelab/theatre
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'main' of gitlab.com:pointerstudio/utils/theatre

Browse source
This commit is contained in:
jrkb 2023-08-04 14:39:35 +02:00
commit c42e940a70
7 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/SingleRowPropEditor.tsx
View file

@ -67,7 +67,6 @@ const PropNameContainer = deriver(styled.div<{
${propNameTextCSS}; ${propNameTextCSS};
&:hover { &:hover {
color: blue;
} }
`) `)

1
theatre/studio/src/panels/OutlinePanel/BaseItem.tsx
View file

@ -21,7 +21,6 @@ const Header = styled(BaseHeader)`
position: relative; position: relative;
margin-bottom: 2px; margin-bottom: 2px;
margin-left: calc(4px + var(--depth) * 16px); margin-left: calc(4px + var(--depth) * 16px);
padding-left: 4px;
padding-right: 8px; padding-right: 8px;
gap: 4px; gap: 4px;
min-height: 21px; min-height: 21px;

18
theatre/studio/src/propEditors/DefaultValueIndicator.tsx
View file

@ -29,21 +29,19 @@ const Rect = styled.rect`
` `
const DefaultIcon = styled.div` const DefaultIcon = styled.div`
width: 5px; width: 8px;
height: 5px; height: 8px;
background-color: currentColor; border-radius: 2px;
border-radius: 0px;
transform: rotate(45deg); transform: rotate(45deg);
border: 1px solid grey; background: #a3a3a3;
` `
const FilledIcon = styled.div` const FilledIcon = styled.div`
width: 5px; width: 8px;
height: 5px; height: 8px;
background-color: currentColor; border-radius: 2px;
border-radius: 0px;
transform: rotate(45deg); transform: rotate(45deg);
border: 1px solid grey; background: #a3a3a3;
` `
const DefaultOrStaticValueIndicator: React.FC<{ const DefaultOrStaticValueIndicator: React.FC<{

10
theatre/studio/src/propEditors/NextPrevKeyframeCursors.tsx
View file

@ -29,7 +29,7 @@ const Container = styled.div`
margin: 0 0px 0 2px; margin: 0 0px 0 2px;
position: relative; position: relative;
z-index: 0; z-index: 0;
opacity: 0.7; opacity: 1;
&:after { &:after {
position: absolute; position: absolute;
@ -152,7 +152,7 @@ namespace Icons {
> >
<Chevron_Group transform={`translate(0 0)`}> <Chevron_Group transform={`translate(0 0)`}>
<path <path
fill="black" fill="#ea2333"
d="M3.8,0c0.4,0,0.8,0.2,0.8,0.6c0,0.5-2.8,3-2.8,4c0,1,2.8,3.4,2.8,4c0,0.4-0.3,0.6-0.8,0.6C2.4,9.3,0,5.8,0,4.6 d="M3.8,0c0.4,0,0.8,0.2,0.8,0.6c0,0.5-2.8,3-2.8,4c0,1,2.8,3.4,2.8,4c0,0.4-0.3,0.6-0.8,0.6C2.4,9.3,0,5.8,0,4.6
C0,3.5,2.4,0,3.8,0z M11,0.4c1.1,0,4.2,3,4.2,4.2c0,1.1-3,4.2-4.2,4.2c-1.1,0-4.2-3-4.2-4.2C6.8,3.4,9.9,0.4,11,0.4z M17.5,0.6 C0,3.5,2.4,0,3.8,0z M11,0.4c1.1,0,4.2,3,4.2,4.2c0,1.1-3,4.2-4.2,4.2c-1.1,0-4.2-3-4.2-4.2C6.8,3.4,9.9,0.4,11,0.4z M17.5,0.6
c0-0.4,0.3-0.6,0.8-0.6C19.6,0,22,3.5,22,4.6c0,1.2-2.4,4.6-3.8,4.6c-0.4,0-0.8-0.2-0.8-0.6c0-0.7,2.8-3.1,2.8-4 c0-0.4,0.3-0.6,0.8-0.6C19.6,0,22,3.5,22,4.6c0,1.2-2.4,4.6-3.8,4.6c-0.4,0-0.8-0.2-0.8-0.6c0-0.7,2.8-3.1,2.8-4
@ -172,7 +172,7 @@ namespace Icons {
> >
<Chevron_Group transform={`translate(2 0)`}> <Chevron_Group transform={`translate(2 0)`}>
<path <path
fill="black" fill="#ea2333"
d="M-13.7,0c0.4,0,0.8,0.2,0.8,0.6c0,0.5-2.8,3-2.8,4c0,1,2.8,3.4,2.8,4c0,0.4-0.3,0.6-0.8,0.6 d="M-13.7,0c0.4,0,0.8,0.2,0.8,0.6c0,0.5-2.8,3-2.8,4c0,1,2.8,3.4,2.8,4c0,0.4-0.3,0.6-0.8,0.6
c-1.3,0-3.8-3.4-3.8-4.6C-17.5,3.5-15.1,0-13.7,0z M-6.5,0.4c1.1,0,4.2,3,4.2,4.2c0,1.1-3,4.2-4.2,4.2c-1.1,0-4.2-3-4.2-4.2 c-1.3,0-3.8-3.4-3.8-4.6C-17.5,3.5-15.1,0-13.7,0z M-6.5,0.4c1.1,0,4.2,3,4.2,4.2c0,1.1-3,4.2-4.2,4.2c-1.1,0-4.2-3-4.2-4.2
C-10.7,3.4-7.6,0.4-6.5,0.4z M0,0.6C0,0.2,0.3,0,0.8,0c1.3,0,3.8,3.5,3.8,4.6c0,1.2-2.4,4.6-3.8,4.6C0.3,9.3,0,9,0,8.7 C-10.7,3.4-7.6,0.4-6.5,0.4z M0,0.6C0,0.2,0.3,0,0.8,0c1.3,0,3.8,3.5,3.8,4.6c0,1.2-2.4,4.6-3.8,4.6C0.3,9.3,0,9,0,8.7
@ -185,8 +185,6 @@ namespace Icons {
const Cur_Group = styled.g` const Cur_Group = styled.g`
stroke-width: 0; stroke-width: 0;
${CurButton}:hover & path { ${CurButton}:hover & path {
stroke: currentColor;
stroke-width: 2;
} }
` `
@ -200,7 +198,7 @@ namespace Icons {
> >
<Cur_Group transform="translate(0 0)"> <Cur_Group transform="translate(0 0)">
<path <path
fill="black" fill="#ea2333"
d="M-3.1,0c0.4,0,0.8,0.2,0.8,0.6c0,0.5-2.8,3-2.8,4c0,1,2.8,3.4,2.8,4c0,0.4-0.3,0.6-0.8,0.6 d="M-3.1,0c0.4,0,0.8,0.2,0.8,0.6c0,0.5-2.8,3-2.8,4c0,1,2.8,3.4,2.8,4c0,0.4-0.3,0.6-0.8,0.6
c-1.3,0-3.8-3.4-3.8-4.6C-6.8,3.5-4.4,0-3.1,0z M4.2,0.4c1.1,0,4.2,3,4.2,4.2c0,1.1-3,4.2-4.2,4.2C3,8.7,0,5.7,0,4.6 c-1.3,0-3.8-3.4-3.8-4.6C-6.8,3.5-4.4,0-3.1,0z M4.2,0.4c1.1,0,4.2,3,4.2,4.2c0,1.1-3,4.2-4.2,4.2C3,8.7,0,5.7,0,4.6
C0,3.4,3,0.4,4.2,0.4z M10.7,0.6C10.7,0.2,11,0,11.4,0c1.3,0,3.8,3.5,3.8,4.6c0,1.2-2.4,4.6-3.8,4.6c-0.4,0-0.8-0.2-0.8-0.6 C0,3.4,3,0.4,4.2,0.4z M10.7,0.6C10.7,0.2,11,0,11.4,0c1.3,0,3.8,3.5,3.8,4.6c0,1.2-2.4,4.6-3.8,4.6c-0.4,0-0.8-0.2-0.8-0.6

1
theatre/studio/src/propEditors/utils/propNameTextCSS.tsx
View file

@ -4,5 +4,6 @@ import {css} from 'styled-components'
export const propNameTextCSS = css<{isHighlighted?: PropHighlighted}>` export const propNameTextCSS = css<{isHighlighted?: PropHighlighted}>`
font-weight: 300; font-weight: 300;
font-size: 12px; font-size: 12px;
font-variation-settings: 'wght' 130;
color: ${(props) => (props.isHighlighted === 'self' ? '#000000' : '#000000')}; color: ${(props) => (props.isHighlighted === 'self' ? '#000000' : '#000000')};
` `

3
theatre/studio/src/uiComponents/form/BasicNumberInput.tsx
View file

@ -43,7 +43,7 @@ const Input = styled.input`
background: rgba(255, 255, 255, 1); background: rgba(255, 255, 255, 1);
border: none; border: none;
color: rgba(0, 0, 0, 1); color: rgba(0, 0, 0, 1);
padding: 1px 6px; padding: 3px 6px 1px 6px;
font: inherit; font: inherit;
outline: none; outline: none;
cursor: ew-resize; cursor: ew-resize;
@ -53,6 +53,7 @@ const Input = styled.input`
border-radius: 0px; border-radius: 0px;
margin-bottom: 0px; margin-bottom: 0px;
text-align: center; text-align: center;
font-variation-settings: 'wght' 200;
&:focus { &:focus {
cursor: text; cursor: text;

3
theatre/studio/src/uiComponents/form/BasicStringInput.tsx
View file

@ -10,7 +10,7 @@ const StyledTextarea = styled.textarea.attrs({type: 'text'})`
background: #ffffff; background: #ffffff;
border: none; border: none;
color: rgba(0, 0, 0, 1); color: rgba(0, 0, 0, 1);
padding: 1px 6px; padding: 3px 6px 1px 6px;
font: inherit; font: inherit;
outline: none; outline: none;
cursor: text; cursor: text;
@ -21,6 +21,7 @@ const StyledTextarea = styled.textarea.attrs({type: 'text'})`
box-sizing: border-box; box-sizing: border-box;
margin-bottom: 10px; margin-bottom: 10px;
margin-top: 10px; margin-top: 10px;
font-variation-settings: 'wght' 200;
&:hover { &:hover {
background-color: #10101042; background-color: #10101042;