consistency

This commit is contained in:
Josh Hawkins 2025-10-08 14:07:41 -05:00
parent aaa7b62408
commit dac965b433
11 changed files with 24 additions and 24 deletions

View File

@ -529,7 +529,7 @@ export default function Settings() {
</SidebarContent> </SidebarContent>
</Sidebar> </Sidebar>
<SidebarInset> <SidebarInset>
<div className="flex-1 overflow-auto p-2"> <div className="flex-1 overflow-auto p-2 pr-0">
{(() => { {(() => {
const CurrentComponent = getCurrentComponent(page); const CurrentComponent = getCurrentComponent(page);
if (!CurrentComponent) return null; if (!CurrentComponent) return null;

View File

@ -407,7 +407,7 @@ export default function AuthenticationView({
<> <>
<div className="mb-5 flex flex-row items-center justify-between gap-2"> <div className="mb-5 flex flex-row items-center justify-between gap-2">
<div className="flex flex-col items-start"> <div className="flex flex-col items-start">
<Heading as="h3" className="my-2"> <Heading as="h4" className="mb-2">
{t("users.management.title")} {t("users.management.title")}
</Heading> </Heading>
<p className="text-sm text-muted-foreground"> <p className="text-sm text-muted-foreground">
@ -596,7 +596,7 @@ export default function AuthenticationView({
<> <>
<div className="mb-5 flex flex-row items-center justify-between gap-2"> <div className="mb-5 flex flex-row items-center justify-between gap-2">
<div className="flex flex-col items-start"> <div className="flex flex-col items-start">
<Heading as="h3" className="my-2"> <Heading as="h4" className="mb-2">
{t("roles.management.title")} {t("roles.management.title")}
</Heading> </Heading>
<p className="text-sm text-muted-foreground"> <p className="text-sm text-muted-foreground">
@ -784,7 +784,7 @@ export default function AuthenticationView({
return ( return (
<div className="flex size-full flex-col"> <div className="flex size-full flex-col">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
{section === "users" && UsersSection} {section === "users" && UsersSection}
{section === "roles" && RolesSection} {section === "roles" && RolesSection}
{!section && ( {!section && (

View File

@ -313,10 +313,10 @@ export default function CameraSettingsView({
<> <>
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
{viewMode === "settings" ? ( {viewMode === "settings" ? (
<> <>
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("camera.title")} {t("camera.title")}
</Heading> </Heading>
<div className="mb-4 flex flex-col gap-4"> <div className="mb-4 flex flex-col gap-4">

View File

@ -244,8 +244,8 @@ export default function EnrichmentsSettingsView({
return ( return (
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("enrichments.title")} {t("enrichments.title")}
</Heading> </Heading>
<Separator className="my-2 flex bg-secondary" /> <Separator className="my-2 flex bg-secondary" />

View File

@ -211,8 +211,8 @@ export default function FrigatePlusSettingsView({
<> <>
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("frigatePlus.title")} {t("frigatePlus.title")}
</Heading> </Heading>

View File

@ -433,7 +433,7 @@ export default function MasksAndZonesView({
{cameraConfig && editingPolygons && ( {cameraConfig && editingPolygons && (
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mb-0 md:mr-2 md:mt-0 md:w-3/12"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:w-3/12">
{editPane == "zone" && ( {editPane == "zone" && (
<ZoneEditPane <ZoneEditPane
polygons={editingPolygons} polygons={editingPolygons}
@ -482,7 +482,7 @@ export default function MasksAndZonesView({
)} )}
{editPane === undefined && ( {editPane === undefined && (
<> <>
<Heading as="h3" className="my-2"> <Heading as="h4" className="mb-2">
{t("menu.masksAndZones")} {t("menu.masksAndZones")}
</Heading> </Heading>
<div className="flex w-full flex-col"> <div className="flex w-full flex-col">

View File

@ -191,8 +191,8 @@ export default function MotionTunerView({
return ( return (
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mb-0 md:mr-2 md:mt-0 md:w-3/12"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:w-3/12">
<Heading as="h3" className="my-2"> <Heading as="h4" className="mb-2">
{t("motionDetectionTuner.title")} {t("motionDetectionTuner.title")}
</Heading> </Heading>
<div className="my-3 space-y-3 text-sm text-muted-foreground"> <div className="my-3 space-y-3 text-sm text-muted-foreground">

View File

@ -331,10 +331,10 @@ export default function NotificationView({
if (!("Notification" in window) || !window.isSecureContext) { if (!("Notification" in window) || !window.isSecureContext) {
return ( return (
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
<div className="grid w-full grid-cols-1 gap-4 md:grid-cols-2"> <div className="grid w-full grid-cols-1 gap-4 md:grid-cols-2">
<div className="col-span-1"> <div className="col-span-1">
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("notification.notificationSettings.title")} {t("notification.notificationSettings.title")}
</Heading> </Heading>
<div className="max-w-6xl"> <div className="max-w-6xl">
@ -385,14 +385,14 @@ export default function NotificationView({
<> <>
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto p-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto p-2 md:order-none">
<div <div
className={cn( className={cn(
isAdmin && "grid w-full grid-cols-1 gap-4 md:grid-cols-2", isAdmin && "grid w-full grid-cols-1 gap-4 md:grid-cols-2",
)} )}
> >
<div className="col-span-1"> <div className="col-span-1">
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("notification.notificationSettings.title")} {t("notification.notificationSettings.title")}
</Heading> </Heading>

View File

@ -164,8 +164,8 @@ export default function ObjectSettingsView({
return ( return (
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mb-0 md:mr-2 md:mt-0 md:w-3/12"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:w-3/12">
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("debug.title")} {t("debug.title")}
</Heading> </Heading>
<div className="mb-5 space-y-3 text-sm text-muted-foreground"> <div className="mb-5 space-y-3 text-sm text-muted-foreground">

View File

@ -414,11 +414,11 @@ export default function TriggerView({
return ( return (
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
{!isSemanticSearchEnabled ? ( {!isSemanticSearchEnabled ? (
<div className="mb-5 flex flex-row items-center justify-between gap-2"> <div className="mb-5 flex flex-row items-center justify-between gap-2">
<div className="flex flex-col items-start"> <div className="flex flex-col items-start">
<Heading as="h4" className="my-2"> <Heading as="h4" className="mb-2">
{t("triggers.management.title")} {t("triggers.management.title")}
</Heading> </Heading>
<p className="mb-5 text-sm text-muted-foreground"> <p className="mb-5 text-sm text-muted-foreground">
@ -452,7 +452,7 @@ export default function TriggerView({
<> <>
<div className="mb-5 flex flex-row items-center justify-between gap-2"> <div className="mb-5 flex flex-row items-center justify-between gap-2">
<div className="flex flex-col items-start"> <div className="flex flex-col items-start">
<Heading as="h3" className="my-2"> <Heading as="h4" className="mb-2">
{t("triggers.management.title")} {t("triggers.management.title")}
</Heading> </Heading>
<p className="text-sm text-muted-foreground"> <p className="text-sm text-muted-foreground">

View File

@ -100,7 +100,7 @@ export default function UiSettingsView() {
<> <>
<div className="flex size-full flex-col md:flex-row"> <div className="flex size-full flex-col md:flex-row">
<Toaster position="top-center" closeButton={true} /> <Toaster position="top-center" closeButton={true} />
<div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none md:mb-0 md:mr-2 md:mt-0"> <div className="scrollbar-container order-last mb-10 mt-2 flex h-full w-full flex-col overflow-y-auto pb-2 md:order-none">
<Heading as="h4" className="mb-2"> <Heading as="h4" className="mb-2">
{t("general.title")} {t("general.title")}
</Heading> </Heading>