From 4b7bccc17cb528cf9f51506378c4c0797ddd227b Mon Sep 17 00:00:00 2001 From: Sam Becker Date: Tue, 11 Mar 2025 00:05:11 -0500 Subject: [PATCH] Refine overlay animation/behavior --- src/components/Badge.tsx | 8 ++++++-- src/photo/PhotoLarge.tsx | 29 +++++++++++++++-------------- src/recipe/PhotoRecipeOverlay.tsx | 6 +++--- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx index 78c478fd..f588e850 100644 --- a/src/components/Badge.tsx +++ b/src/components/Badge.tsx @@ -37,10 +37,14 @@ export default function Badge({ : 'text-medium bg-gray-300/30 dark:bg-gray-700/50', interactive && (contrast === 'high' ? 'hover:opacity-70' - : 'hover:text-gray-900 dark:hover:text-gray-100'), + : contrast === 'frosted' + ? 'hover:text-black dark:hover:text-black' + : 'hover:text-gray-900 dark:hover:text-gray-100'), interactive && (contrast === 'high' ? 'active:opacity-90' - : 'active:bg-gray-200 dark:active:bg-gray-700/60'), + : contrast === 'frosted' + ? 'active:bg-neutral-100/50 dark:active:bg-neutral-900/10' + : 'active:bg-gray-200 dark:active:bg-gray-700/60'), ); } }; diff --git a/src/photo/PhotoLarge.tsx b/src/photo/PhotoLarge.tsx index 7c1a063e..06557768 100644 --- a/src/photo/PhotoLarge.tsx +++ b/src/photo/PhotoLarge.tsx @@ -193,23 +193,24 @@ export default function PhotoLarge({
{(shouldShowRecipeOverlay || shouldDebugRecipeOverlays) && - photo.recipeData && - photo.filmSimulation && - } + photo.recipeData && + photo.filmSimulation && + }
; diff --git a/src/recipe/PhotoRecipeOverlay.tsx b/src/recipe/PhotoRecipeOverlay.tsx index f4dbccb2..085007f4 100644 --- a/src/recipe/PhotoRecipeOverlay.tsx +++ b/src/recipe/PhotoRecipeOverlay.tsx @@ -74,9 +74,9 @@ export default function PhotoRecipeOverlay({ return (