diff --git a/apps/client/src/theme/ontimeTextInputs.ts b/apps/client/src/theme/ontimeTextInputs.ts index ec96e7fba..86b6d5534 100644 --- a/apps/client/src/theme/ontimeTextInputs.ts +++ b/apps/client/src/theme/ontimeTextInputs.ts @@ -43,7 +43,7 @@ export const ontimeInputTransparent = { ...commonStyles, backgroundColor: 'transparent', _hover: { - backgroundColor: 'rgba(255, 255, 255, 0.10)', // $white-10 + backgroundColor: '#2d2d2d', // $gray-1100 }, }, }; @@ -56,6 +56,6 @@ export const ontimeTextAreaTransparent = { ...commonStyles, backgroundColor: 'transparent', _hover: { - backgroundColor: 'rgba(255, 255, 255, 0.10)', // $white-10 + backgroundColor: '#2d2d2d', // $gray-1100 }, }; diff --git a/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.module.scss b/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.module.scss index aa2bbdb52..2f51170dc 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.module.scss +++ b/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.module.scss @@ -48,7 +48,7 @@ $table-header-font-size: calc(1rem - 2px); } .actionColumn { - width: calc(1.5rem + 0.5rem); // sm button size (--chakra-sizes-6) + 2 * padding + width: calc(2rem + 0.5rem); // sm button size (--chakra-sizes-8) + 2 * padding } } diff --git a/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx b/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx index c2f1c4731..0a2384a53 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx +++ b/apps/client/src/views/cuesheet/cuesheet-table/CuesheetTable.tsx @@ -150,10 +150,10 @@ export default function CuesheetTable(props: CuesheetTableProps) { } - variant='ontime-ghosted' + variant='ontime-subtle' /> {row.getVisibleCells().map((cell) => { diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/MultiLineCell.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/MultiLineCell.tsx index 0599b44b5..d8fcfbcbc 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/MultiLineCell.tsx +++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/MultiLineCell.tsx @@ -8,7 +8,9 @@ interface MultiLineCellProps { handleUpdate: (newValue: string) => void; } -const MultiLineCell = (props: MultiLineCellProps) => { +export default memo(MultiLineCell); + +function MultiLineCell(props: MultiLineCellProps) { const { initialValue, handleUpdate } = props; const ref = useRef(null); const submitCallback = useCallback((newValue: string) => handleUpdate(newValue), [handleUpdate]); @@ -22,8 +24,12 @@ const MultiLineCell = (props: MultiLineCellProps) => { inputref={ref} rows={1} size='sm' - padding={0} - fontSize='1rem' + style={{ + minHeight: '2rem', + padding: '0', + paddingTop: '0.25rem', + fontSize: '1rem', + }} transition='none' variant='ontime-transparent' value={value} @@ -33,6 +39,4 @@ const MultiLineCell = (props: MultiLineCellProps) => { spellCheck={false} /> ); -}; - -export default memo(MultiLineCell); +} diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SingleLineCell.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SingleLineCell.tsx index f8216d4a8..7f1e1f254 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SingleLineCell.tsx +++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/SingleLineCell.tsx @@ -8,7 +8,9 @@ interface SingleLineCellProps { handleUpdate: (newValue: string) => void; } -const SingleLineCell = (props: SingleLineCellProps) => { +export default memo(SingleLineCell); + +function SingleLineCell(props: SingleLineCellProps) { const { initialValue, handleUpdate } = props; const ref = useRef(null); const submitCallback = useCallback((newValue: string) => handleUpdate(newValue), [handleUpdate]); @@ -20,8 +22,10 @@ const SingleLineCell = (props: SingleLineCellProps) => { return ( { autoComplete='off' /> ); -}; - -export default memo(SingleLineCell); +} diff --git a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetCols.tsx b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetCols.tsx index 2a795c793..4b260cee8 100644 --- a/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetCols.tsx +++ b/apps/client/src/views/cuesheet/cuesheet-table/cuesheet-table-elements/cuesheetCols.tsx @@ -102,6 +102,7 @@ export function makeCuesheetColumns(customFields: CustomFields): ColumnDef