🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor SubHeader and Filters components for improved layout and styling
Bill Yangaf62d21ca4d3
diff --git a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsxindex abedb8f37..0adaa75b4 100644--- a/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/Filters.tsx@@ -35,7 +35,7 @@ export function Filters({ availableFilters }: { availableFilters?: FilterParamet</div><divclassName={cn(- "text-emerald-400 font-medium cursor-pointer whitespace-nowrap",+ "text-emerald-400 font cursor-pointer whitespace-nowrap",(filter.type === "not_equals" || filter.type === "not_contains") && "text-red-400")}onClick={() => {diff --git a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsxindex ebb23ebf7..fb761ad4f 100644--- a/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx+++ b/client/src/app/[site]/components/SubHeader/Filters/NewFilterButton.tsx@@ -53,19 +53,17 @@ export function NewFilterButton({ availableFilters }: { availableFilters?: Filte}}open={open}>- <DropdownMenuTrigger asChild>- <Button- className="text-xs sm:text-sm h-8 sm:h-9 px-3 p-2 sm:p-3"- onClick={() => {- if (localFilters.length === 0) {- addLocalFilter();- }- setOpen(true);- }}- >- <ListFilterPlus className="w-4 h-4" />- Filter- </Button>+ <DropdownMenuTrigger+ size={"sm"}+ onClick={() => {+ if (localFilters.length === 0) {+ addLocalFilter();+ }+ setOpen(true);+ }}+ >+ <ListFilterPlus className="w-4 h-4" />+ Filter</DropdownMenuTrigger><DropdownMenuContent align="start" className="flex flex-col p-0 max-w-[95vw]"><div className="flex flex-col gap-2 p-3">diff --git a/client/src/app/[site]/components/SubHeader/SubHeader.tsx b/client/src/app/[site]/components/SubHeader/SubHeader.tsxindex 27875baca..9b97fcb59 100644--- a/client/src/app/[site]/components/SubHeader/SubHeader.tsx+++ b/client/src/app/[site]/components/SubHeader/SubHeader.tsx@@ -42,7 +42,7 @@ export function SubHeader({ availableFilters }: { availableFilters?: FilterParamreturn (<div>- <div className="flex gap-2 mb-3 justify-between">+ <div className="flex gap-2 justify-between"><div className="flex items-center gap-2"><MobileSidebar /><div className="hidden md:block">@@ -58,7 +58,7 @@ export function SubHeader({ availableFilters }: { availableFilters?: FilterParamsize="icon"onClick={goBack}disabled={time.mode === "past-minutes"}- className="rounded-r-none h-8 w-8 sm:h-9 sm:w-9"+ className="rounded-r-none h-8 w-8"><ChevronLeft /></Button>@@ -67,18 +67,20 @@ export function SubHeader({ availableFilters }: { availableFilters?: FilterParamsize="icon"onClick={goForward}disabled={!canGoForward(time)}- className="rounded-l-none -ml-px h-8 w-8 sm:h-9 sm:w-9"+ className="rounded-l-none -ml-px h-8 w-8"><ChevronRight /></Button></div></div></div>- <div className="flex gap-2">- <div className="md:hidden">+ <div>+ <div className="md:hidden mt-3"><NewFilterButton availableFilters={availableFilters} /></div>- <Filters availableFilters={availableFilters} />+ <div className="mt-2">+ <Filters availableFilters={availableFilters} />+ </div></div></div>);diff --git a/client/src/components/DateSelector/DateSelector.tsx b/client/src/components/DateSelector/DateSelector.tsxindex 8bacf507d..287f654a8 100644--- a/client/src/components/DateSelector/DateSelector.tsx+++ b/client/src/components/DateSelector/DateSelector.tsx@@ -104,7 +104,7 @@ export function DateSelector({}) {return (<DropdownMenu>- <DropdownMenuTrigger className="text-xs sm:text-sm p-2 sm:p-3 h-8 sm:h-9" variant={"default"}>+ <DropdownMenuTrigger size={"sm"}><Calendar className="hidden sm:block w-4 h-4" />{getLabel(time)}</DropdownMenuTrigger>diff --git a/client/src/components/ui/button.tsx b/client/src/components/ui/button.tsxindex d2beff657..aa0eb1ab8 100644--- a/client/src/components/ui/button.tsx+++ b/client/src/components/ui/button.tsx@@ -5,7 +5,7 @@ import { cva, type VariantProps } from "class-variance-authority";import { cn } from "@/lib/utils";const buttonVariants = cva(- "inline-flex items-center justify-center gap-2 whitespace-nowrap rounded-lg text-sm font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 dark:focus-visible:ring-neutral-300",+ "inline-flex items-center justify-center gap-2 whitespace-nowrap font-medium transition-colors focus-visible:outline-none focus-visible:ring-1 focus-visible:ring-neutral-950 disabled:pointer-events-none disabled:opacity-50 [&_svg]:pointer-events-none [&_svg]:size-4 [&_svg]:shrink-0 dark:focus-visible:ring-neutral-300",{variants: {variant: {@@ -28,12 +28,12 @@ const buttonVariants = cva(link: "text-neutral-900 underline-offset-4 hover:underline dark:text-neutral-50",},size: {- default: "h-9 px-4 py-2",- sm: "h-8 rounded-md px-3 text-xs",- xs: "h-6 rounded-sm px-2 text-xs",- lg: "h-10 rounded-md px-8",- icon: "h-9 w-9",- smIcon: "h-7 w-7",+ default: "h-9 px-3 py-2 rounded-lg text-sm",+ sm: "h-8 rounded-lg px-2.5 text-xs",+ xs: "h-6 px-1.5 text-xs",+ lg: "h-10 rounded-lg px-8 text-sm",+ icon: "h-9 w-9 rounded-lg",+ smIcon: "h-7 w-7 rounded-md",},},defaultVariants: {