Merge remote-tracking branch 'origin/main'

# Conflicts:
#	yarn.lock
This commit is contained in:
killian-larcher
2024-11-11 15:00:34 +01:00
24 changed files with 626 additions and 37 deletions
+14 -11
View File
@@ -1,4 +1,6 @@
import {PropsWithChildren} from 'react';
import {twx} from "@/lib/twx";
import {cn} from "@/lib/utils";
export const Page = ({children}: PropsWithChildren<{}>) => {
return (
@@ -12,17 +14,17 @@ export const PageHeader = ({children}: PropsWithChildren<{}>) => {
);
};
export const PageTitle = ({children}: PropsWithChildren<{}>) => {
return (
<h1 className="text-3xl font-bold mb-6">{children}</h1>
);
};
export const PageDescription = ({children}: PropsWithChildren<{}>) => {
return (
<h2 className="text-s mb-6 text-gray-700">{children}</h2>
);
};
export const PageTitle = twx.h1((props)=>[
cn(`text-3xl font-bold mb-6`, props.className),
])
export const PageDescription = twx.h2((props)=>[
cn(`text-s mb-6 text-gray-700`, props.className),
])
export const PageActions = ({children}: PropsWithChildren<{}>) => {
return (
@@ -35,4 +37,5 @@ export const PageContent = ({children}: PropsWithChildren<{}>) => {
return (
<div className="">{children}</div>
);
};
};