Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

style(ui): tonal popovers for the filter and date pickers (#1189)

Goldflage7d3cd7c31bf
diff --git a/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx b/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx
index 114c76a09..d4e48780a 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/FilterPicker.tsx
@@ -33,17 +33,17 @@ function RegexExamples() {
return (
<ul className="text-xs space-y-1">
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"^/blog/"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"^/blog/"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Paths starting with /blog/")}</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"/blog/.*"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"/blog/.*"}</code>
<span className="text-neutral-500 ml-1">
β€” {t("Paths containing /blog/ followed by anything")}
</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"\\.(pdf|doc|docx)$"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"\\.(pdf|doc|docx)$"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Paths ending in .pdf, .doc, or .docx")}</span>
</li>
</ul>
@@ -175,7 +175,7 @@ function ValueStep({
return (
<div className="flex flex-col">
- <div className="flex items-center justify-between px-2 py-2 border-b border-neutral-200 dark:border-neutral-800">
+ <div className="flex items-center justify-between px-2 py-2 border-b border-neutral-200 dark:border-neutral-700">
<button
type="button"
onClick={onBack}
@@ -205,8 +205,8 @@ function ValueStep({
type="button"
onClick={() => selectOperator(option.value as FilterType)}
className={cn(
- "text-left px-3 py-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-800",
- isSelected && "bg-neutral-100 dark:bg-neutral-800"
+ "text-left px-3 py-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-750",
+ isSelected && "bg-neutral-100 dark:bg-neutral-750"
)}
>
{getOperatorMenuLabel(option.value as FilterType, isNumeric)}
@@ -300,7 +300,7 @@ function ValueStep({
)
)}
{needsValue && (
- <div className="border-t border-neutral-200 dark:border-neutral-800 p-2">
+ <div className="border-t border-neutral-200 dark:border-neutral-700 p-2">
<Button
type="button"
size="sm"
diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
index bb06584d0..e8cc57884 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx
@@ -99,7 +99,7 @@ export function NewFilterButton({ availableFilters }: { availableFilters?: Filte
</Button>
</PopoverTrigger>
<PopoverContent className="w-72 p-0" align="start">
- <div role="tablist" className="flex border-b border-neutral-200 dark:border-neutral-800">
+ <div role="tablist" className="flex border-b border-neutral-200 dark:border-neutral-700">
{tabButton("filters", t("Filters"))}
{tabButton("segments", t("Segments"))}
</div>
diff --git a/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx b/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx
index 91eaf74e0..8fbe5a29f 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/OperatorPopover.tsx
@@ -59,8 +59,8 @@ export function OperatorPopover({
type="button"
onClick={() => handleSelect(option.value as FilterType)}
className={cn(
- "text-left px-3 py-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-800",
- isSelected && "bg-neutral-100 dark:bg-neutral-800"
+ "text-left px-3 py-2 text-sm hover:bg-neutral-100 dark:hover:bg-neutral-750",
+ isSelected && "bg-neutral-100 dark:bg-neutral-750"
)}
>
{getOperatorMenuLabel(option.value as FilterType, isNumeric)}
diff --git a/client/src/app/[site]/components/SubHeader/Filters/SegmentChip.tsx b/client/src/app/[site]/components/SubHeader/Filters/SegmentChip.tsx
index 9cd4ecd5c..5fa0d5c1c 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/SegmentChip.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/SegmentChip.tsx
@@ -58,7 +58,7 @@ export function SegmentChip({
</Button>
</PopoverTrigger>
<PopoverContent align="start" className="w-80 p-0">
- <div className="px-3 pt-3 pb-2 border-b border-neutral-200 dark:border-neutral-800">
+ <div className="px-3 pt-3 pb-2 border-b border-neutral-200 dark:border-neutral-700">
<div className="flex items-center gap-2 text-sm font-medium">
<span className="truncate">{segment.name}</span>
{segment.siteId === null && (
@@ -100,7 +100,7 @@ export function SegmentChip({
</p>
)}
</div>
- <div className="border-t border-neutral-200 dark:border-neutral-800 p-2 flex items-center justify-between">
+ <div className="border-t border-neutral-200 dark:border-neutral-700 p-2 flex items-center justify-between">
{segment.canEdit && onEdit ? (
<Button size="sm" variant="ghost" onClick={() => onEdit(segment)} className="gap-1.5">
<Pencil className="h-3.5 w-3.5" />
diff --git a/client/src/app/[site]/components/SubHeader/Filters/SegmentsTab.tsx b/client/src/app/[site]/components/SubHeader/Filters/SegmentsTab.tsx
index e1ef23224..be6ccbc50 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/SegmentsTab.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/SegmentsTab.tsx
@@ -118,7 +118,7 @@ export function SegmentsTab({
};
const footer = canWrite && (
- <div className="border-t border-neutral-200 dark:border-neutral-800 p-2 flex flex-col gap-1.5">
+ <div className="border-t border-neutral-200 dark:border-neutral-700 p-2 flex flex-col gap-1.5">
{canSaveCurrent && (
<Button size="sm" variant="success" className="w-full gap-1.5" onClick={onSaveCurrent}>
<BookmarkPlus className="h-4 w-4" />
@@ -173,7 +173,7 @@ export function SegmentsTab({
key={segment.segmentId}
value={`${segment.name} ${segment.segmentId}`}
onSelect={() => toggle(segment)}
- className={cn("cursor-pointer items-start gap-2 py-2", isActive && "bg-neutral-100 dark:bg-neutral-800")}
+ className={cn("cursor-pointer items-start gap-2 py-2", isActive && "bg-neutral-100 dark:bg-neutral-750")}
>
<Layers className="h-4 w-4 mt-0.5 shrink-0 text-neutral-500 dark:text-neutral-400" />
<div className="flex-1 min-w-0">
diff --git a/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx b/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
index eb0334810..4706f35b7 100644
--- a/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
+++ b/client/src/app/[site]/components/SubHeader/Filters/ValuePopover.tsx
@@ -27,29 +27,29 @@ function RegexExamples() {
return (
<ul className="text-xs space-y-1">
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"^/blog/"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"^/blog/"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Paths starting with /blog/")}</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"/blog/.*"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"/blog/.*"}</code>
<span className="text-neutral-500 ml-1">
β€” {t("Paths containing /blog/ followed by anything")}
</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"\\.(pdf|doc|docx)$"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"\\.(pdf|doc|docx)$"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Paths ending in .pdf, .doc, or .docx")}</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"^/products/[0-9]+$"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"^/products/[0-9]+$"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Product pages with numeric IDs")}</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"(?i)newsletter"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"(?i)newsletter"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Case-insensitive match for 'newsletter'")}</span>
</li>
<li>
- <code className="bg-neutral-100 dark:bg-neutral-800 px-1 rounded">{"^(?!.*test).*$"}</code>
+ <code className="bg-neutral-100 dark:bg-neutral-700 px-1 rounded">{"^(?!.*test).*$"}</code>
<span className="text-neutral-500 ml-1">β€” {t("Paths NOT containing 'test'")}</span>
</li>
</ul>
diff --git a/client/src/components/DateSelector/ComparisonSelect.tsx b/client/src/components/DateSelector/ComparisonSelect.tsx
index bddb26e8e..b44044d29 100644
--- a/client/src/components/DateSelector/ComparisonSelect.tsx
+++ b/client/src/components/DateSelector/ComparisonSelect.tsx
@@ -116,7 +116,7 @@ export function ComparisonSelect({
onClick={() => selectMode(mode)}
aria-pressed={selected}
className={cn(
- "flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-left text-xs text-neutral-700 hover:bg-neutral-100 dark:text-neutral-200 dark:hover:bg-neutral-800",
+ "flex w-full items-center gap-2 rounded-sm px-2 py-1.5 text-left text-xs text-neutral-700 hover:bg-neutral-100 dark:text-neutral-200 dark:hover:bg-neutral-750",
selected && "font-medium"
)}
>
diff --git a/client/src/components/DateSelector/RangePanel.tsx b/client/src/components/DateSelector/RangePanel.tsx
index 8ec4e5263..6d8414d93 100644
--- a/client/src/components/DateSelector/RangePanel.tsx
+++ b/client/src/components/DateSelector/RangePanel.tsx
@@ -173,7 +173,7 @@ export function RangePanel({
return (
<div className="flex flex-col">
<div className="flex flex-col md:flex-row">
- <div className="w-full border-b border-neutral-150 md:w-[190px] md:shrink-0 md:border-b-0 md:border-r dark:border-neutral-800">
+ <div className="w-full border-b border-neutral-150 md:w-[190px] md:shrink-0 md:border-b-0 md:border-r dark:border-neutral-700">
<Command shouldFilter={false} defaultValue={defaultValue}>
<CommandInput placeholder={t("Search, or type 14d, 6h")} value={query} onValueChange={setQuery} />
{/* Capped so the rail ends level with the calendar column beside it
@@ -272,7 +272,7 @@ export function RangePanel({
className="mx-auto p-0 md:mx-0"
/>
- <div className="mt-3 hidden flex-col gap-2 border-t border-neutral-150 pt-3 md:flex dark:border-neutral-800">
+ <div className="mt-3 hidden flex-col gap-2 border-t border-neutral-150 pt-3 md:flex dark:border-neutral-700">
<BoundRow
label={t("From")}
date={draft.fields.startDate}
@@ -297,7 +297,7 @@ export function RangePanel({
</div>
</div>
- <div className="flex flex-wrap items-center gap-2 border-t border-neutral-150 px-3 py-2 dark:border-neutral-800">
+ <div className="flex flex-wrap items-center gap-2 border-t border-neutral-150 px-3 py-2 dark:border-neutral-700">
{draft.invalid ? (
<span className="mr-auto text-xs text-red-500 dark:text-red-400">
{t("Enter a date range that ends after it starts, on or before today")}
diff --git a/client/src/components/ui/calendar.tsx b/client/src/components/ui/calendar.tsx
index 3b8eea7b6..c626cfb77 100644
--- a/client/src/components/ui/calendar.tsx
+++ b/client/src/components/ui/calendar.tsx
@@ -62,7 +62,7 @@ function Calendar({
defaultClassNames.dropdowns
),
dropdown_root: cn(
- "relative rounded-md border border-neutral-150 shadow-xs has-focus:border-neutral-500 has-focus:ring-[3px] has-focus:ring-neutral-500/50 dark:border-neutral-800 dark:has-focus:border-neutral-400 dark:has-focus:ring-neutral-400/50",
+ "relative rounded-md border border-neutral-150 shadow-xs has-focus:border-neutral-500 has-focus:ring-[3px] has-focus:ring-neutral-500/50 dark:border-neutral-700 dark:has-focus:border-neutral-400 dark:has-focus:ring-neutral-400/50",
defaultClassNames.dropdown_root
),
dropdown: cn("absolute inset-0 bg-white opacity-0 dark:bg-neutral-900", defaultClassNames.dropdown),
diff --git a/client/src/components/ui/popover.tsx b/client/src/components/ui/popover.tsx
index 737eada84..c51f82705 100644
--- a/client/src/components/ui/popover.tsx
+++ b/client/src/components/ui/popover.tsx
@@ -25,7 +25,7 @@ const PopoverContent = React.forwardRef<
align={align}
sideOffset={sideOffset}
className={cn(
- "z-50 w-72 rounded-md border border-neutral-150 bg-white p-4 text-neutral-950 shadow-md outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[var(--radix-popover-content-transform-origin)] dark:border-neutral-800 dark:bg-neutral-900 dark:text-neutral-50",
+ "z-50 w-72 rounded-md border border-neutral-100 bg-white p-4 text-neutral-950 shadow-[0_12px_32px_-8px_rgba(0,0,0,0.18),0_1px_2px_rgba(0,0,0,0.06)] outline-none data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2 origin-[var(--radix-popover-content-transform-origin)] dark:border-transparent dark:bg-neutral-800 dark:text-neutral-50 dark:shadow-[0_12px_32px_-8px_rgba(0,0,0,0.65),0_1px_2px_rgba(0,0,0,0.4)] dark:[&_input]:border-neutral-700",
className
)}
{...props}