From dc7e5a1128d1be2ff9c6e86ce8222771009e4827 Mon Sep 17 00:00:00 2001 From: Aria Minaei Date: Mon, 13 Jun 2022 15:00:21 +0200 Subject: [PATCH] Use text color rather than bg to highlight hovered props --- .../DetailCompoundPropEditor.tsx | 15 +++++++++------ .../SingleRowPropEditor.tsx | 9 ++++++--- .../src/propEditors/utils/propNameTextCSS.tsx | 5 +++-- 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/DetailCompoundPropEditor.tsx b/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/DetailCompoundPropEditor.tsx index 97781a0..ccf3847 100644 --- a/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/DetailCompoundPropEditor.tsx +++ b/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/DetailCompoundPropEditor.tsx @@ -33,7 +33,7 @@ const Header = deriver(styled.div<{isHighlighted: PropHighlighted}>` align-items: stretch; position: relative; - background-color: ${getDetailRowHighlightBackground}; + /* background-color: ${getDetailRowHighlightBackground}; */ `) const Padding = styled.div` @@ -42,7 +42,7 @@ const Padding = styled.div` align-items: center; ` -const PropName = styled.div` +const PropName = deriver(styled.div<{isHighlighted: PropHighlighted}>` margin-left: 4px; cursor: default; height: 100%; @@ -54,7 +54,7 @@ const PropName = styled.div` } ${() => propNameTextCSS}; -` +`) const color = transparentize(0.05, `#282b2f`) @@ -114,8 +114,6 @@ function DetailCompoundPropEditor< [pointerToProp], ) - // previous versions of the DetailCompoundPropEditor had a context menu item for "Reset values". - return ( {contextMenu} @@ -126,7 +124,12 @@ function DetailCompoundPropEditor< > {tools.controlIndicators} - {propName || 'Props'} + + {propName || 'Props'} + diff --git a/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/SingleRowPropEditor.tsx b/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/SingleRowPropEditor.tsx index fdfb8ed..2fe174c 100644 --- a/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/SingleRowPropEditor.tsx +++ b/theatre/studio/src/panels/DetailPanel/DeterminePropEditorForDetail/SingleRowPropEditor.tsx @@ -33,7 +33,7 @@ const Container = deriver(styled.div<{ position: relative; ${pointerEventsAutoInNormalMode}; - background-color: ${getDetailRowHighlightBackground}; + /* background-color: ${getDetailRowHighlightBackground}; */ `) const Left = styled.div` @@ -50,7 +50,9 @@ const Left = styled.div` width: calc(100% - var(--right-width)); ` -const PropNameContainer = styled.div` +const PropNameContainer = deriver(styled.div<{ + isHighlighted: PropHighlighted +}>` text-align: left; flex: 1 0; white-space: nowrap; @@ -65,7 +67,7 @@ const PropNameContainer = styled.div` &:hover { color: white; } -` +`) const ControlsContainer = styled.div` flex-basis: 8px; @@ -118,6 +120,7 @@ export function SingleRowPropEditor({ {editingTools.controlIndicators} ` font-weight: 300; font-size: 11px; - color: #919191; + color: ${(props) => (props.isHighlighted === 'self' ? '#CCC' : '#919191')}; text-shadow: 0.5px 0.5px 2px rgba(0, 0, 0, 0.3); `