External/portabase
1
0
Fork 0
mirror of https://github.com/Portabase/portabase.git synced 2026-07-14 11:16:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

merging.

Browse Source
This commit is contained in:
killian-larcher
2024-11-11 19:21:13 +01:00
parent 262322cfa6
commit baf69c0295
2 changed files with 6 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/features/layout/page.tsx
+5 -20
View File
@@ -2,17 +2,8 @@ import {twx} from "@/lib/twx";
import {cn} from "@/lib/utils";
<<<<<<< HEAD
export const Page = twx.div((props) => [
cn(`flex flex-col h-full px-10 py-6`, props.className),
=======
export const PageHeader = twx.div((props)=>[
cn(`flex justify-between`, props.className),
])
export const PageTitle = twx.h1((props)=>[
cn(`text-3xl font-bold mb-6`, props.className),
>>>>>>> origin/main
cn(`flex flex-col h-full px-10 py-6`, props.className)
])
@@ -31,17 +22,11 @@ export const PageDescription = twx.h2((props) => [
])
<<<<<<< HEAD
export const PageActions = twx.h1((props) => [
cn(`flex gap-4 h-fit`, props.className),
])
cn(`flex gap-4 h-fit`, props.className),
]
)
export const PageContent = twx.div((props) => [
cn(`h-full`, props.className),
=======
export const PageActions = twx.h1((props)=>[
cn(`flex gap-4`, props.className),
>>>>>>> origin/main
cn(`h-full`, props.className)
])