From b72b61b790815fb3bda1c02b6cf3ca8ce2380e3a Mon Sep 17 00:00:00 2001 From: psychedelicious <4822129+psychedelicious@users.noreply.github.com> Date: Sun, 20 Nov 2022 19:35:32 +1100 Subject: [PATCH] Styling updates --- .../src/features/canvas/components/IAICanvasGrid.tsx | 9 +++++++-- .../src/features/gallery/components/HoverableImage.tsx | 1 + .../src/features/tabs/components/FloatingButton.scss | 3 +++ .../src/features/tabs/components/InvokeOptionsPanel.tsx | 5 +++++ frontend/src/styles/Themes/_Colors_Dark.scss | 2 +- frontend/src/styles/Themes/_Colors_Green.scss | 2 +- frontend/src/styles/Themes/_Colors_Light.scss | 2 +- 7 files changed, 19 insertions(+), 5 deletions(-) diff --git a/frontend/src/features/canvas/components/IAICanvasGrid.tsx b/frontend/src/features/canvas/components/IAICanvasGrid.tsx index 0b09b38868..7495f0ee7d 100644 --- a/frontend/src/features/canvas/components/IAICanvasGrid.tsx +++ b/frontend/src/features/canvas/components/IAICanvasGrid.tsx @@ -21,6 +21,12 @@ const selector = createSelector( } ); +const gridLinesColor = { + dark: 'rgba(255, 255, 255, 0.2)', + green: 'rgba(255, 255, 255, 0.2)', + light: 'rgba(0, 0, 0, 0.2)', +}; + const IAICanvasGrid = () => { const { colorMode } = useColorMode(); const { stageScale, stageCoordinates, stageDimensions } = @@ -35,8 +41,7 @@ const IAICanvasGrid = () => { ); useLayoutEffect(() => { - const gridLineColor = - colorMode === 'light' ? 'rgba(136, 136, 136, 1)' : 'rgba(84, 84, 84, 1)'; + const gridLineColor = gridLinesColor[colorMode]; const { width, height } = stageDimensions; const { x, y } = stageCoordinates; diff --git a/frontend/src/features/gallery/components/HoverableImage.tsx b/frontend/src/features/gallery/components/HoverableImage.tsx index a93965ace0..5748b51aab 100644 --- a/frontend/src/features/gallery/components/HoverableImage.tsx +++ b/frontend/src/features/gallery/components/HoverableImage.tsx @@ -167,6 +167,7 @@ const HoverableImage = memo((props: HoverableImageProps) => { className="hoverable-image" onMouseOver={handleMouseOver} onMouseOut={handleMouseOut} + userSelect={'none'} > { onMouseOver={ !shouldPinOptionsPanel ? cancelCloseOptionsPanelTimer : undefined } + style={{ + borderRight: !shouldPinOptionsPanel + ? '0.3rem solid var(--tab-list-text-inactive)' + : '', + }} >