From 4edfa9609f25560a0c4e5e2e845fd0d792516daf Mon Sep 17 00:00:00 2001 From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com> Date: Tue, 20 Feb 2024 10:41:48 -0600 Subject: [PATCH] colors and tweaks --- .../timeline/EventReviewTimeline.tsx | 7 +- web/src/components/timeline/EventSegment.tsx | 16 +- web/src/hooks/use-handle-dragging.ts | 6 +- web/src/index.css | 1 + web/src/pages/UIPlayground.tsx | 2 +- web/tailwind.config.js | 12 + web/themes/tailwind-base.css | 287 ++++++++++++++++++ web/themes/theme-default.css | 9 + 8 files changed, 326 insertions(+), 14 deletions(-) create mode 100644 web/themes/tailwind-base.css diff --git a/web/src/components/timeline/EventReviewTimeline.tsx b/web/src/components/timeline/EventReviewTimeline.tsx index 71c8b8912..ff5b73373 100644 --- a/web/src/components/timeline/EventReviewTimeline.tsx +++ b/web/src/components/timeline/EventReviewTimeline.tsx @@ -93,6 +93,7 @@ export function EventReviewTimeline({ return ( @@ -219,7 +220,7 @@ export function EventReviewTimeline({ onMouseDown={handleMouseDown} >
@@ -228,7 +229,7 @@ export function EventReviewTimeline({ className="text-white text-xs z-10" >
-
+
diff --git a/web/src/components/timeline/EventSegment.tsx b/web/src/components/timeline/EventSegment.tsx index 16c5112ac..76b51688a 100644 --- a/web/src/components/timeline/EventSegment.tsx +++ b/web/src/components/timeline/EventSegment.tsx @@ -189,10 +189,10 @@ export function EventSegment({ const segmentClasses = `flex flex-row ${ showMinimap ? isInMinimapRange - ? "bg-muted" + ? "bg-card" : isLastSegmentInMinimap ? "" - : "opacity-80" + : "opacity-70" : "" } ${ isFirstSegmentInMinimap || isLastSegmentInMinimap @@ -202,12 +202,14 @@ export function EventSegment({ const severityColors: { [key: number]: string } = { 1: reviewed - ? "from-yellow-200/30 to-yellow-400/30" - : "from-yellow-200 to-yellow-400", + ? "from-severity_motion-dimmed/30 to-severity_motion/30" + : "from-severity_motion-dimmed to-severity_motion", 2: reviewed - ? "from-orange-400/30 to-orange-600/30" - : "from-orange-400 to-orange-600", - 3: reviewed ? "from-red-500/30 to-red-800/30" : "from-red-500 to-red-800", + ? "from-severity_detection-dimmed/30 to-severity_detection/30" + : "from-severity_detection-dimmed to-severity_detection", + 3: reviewed + ? "from-severity_alert-dimmed/30 to-severity_alert/30" + : "from-severity_alert-dimmed to-severity_alert", }; return ( diff --git a/web/src/hooks/use-handle-dragging.ts b/web/src/hooks/use-handle-dragging.ts index d0e180646..ca4f15e85 100644 --- a/web/src/hooks/use-handle-dragging.ts +++ b/web/src/hooks/use-handle-dragging.ts @@ -29,7 +29,7 @@ function useDraggableHandler({ currentTimeRef, }: DragHandlerProps) { const handleMouseDown = useCallback( - (e: React.MouseEvent) => { + (e: React.MouseEvent|React.TouchEvent) => { e.preventDefault(); e.stopPropagation(); setIsDragging(true); @@ -38,7 +38,7 @@ function useDraggableHandler({ ); const handleMouseUp = useCallback( - (e: MouseEvent) => { + (e: MouseEvent|TouchEvent) => { e.preventDefault(); e.stopPropagation(); if (isDragging) { @@ -49,7 +49,7 @@ function useDraggableHandler({ ); const handleMouseMove = useCallback( - (e: MouseEvent) => { + (e: MouseEvent|TouchEvent) => { if (!contentRef.current || !timelineRef.current || !scrollTimeRef.current) { return; } diff --git a/web/src/index.css b/web/src/index.css index 14e9f4f73..0f9156ac8 100644 --- a/web/src/index.css +++ b/web/src/index.css @@ -1,3 +1,4 @@ +@import "/themes/tailwind-base.css"; @import "/themes/theme-default.css"; @import "/themes/theme-blue.css"; @import "/themes/theme-gold.css"; diff --git a/web/src/pages/UIPlayground.tsx b/web/src/pages/UIPlayground.tsx index 9d6602902..2c23acce1 100644 --- a/web/src/pages/UIPlayground.tsx +++ b/web/src/pages/UIPlayground.tsx @@ -146,7 +146,7 @@ function UIPlayground() { for usage.

-
+
{colors.map((color, index) => (