Skip to content
Snippets Groups Projects
Commit 6751c7b9 authored by Julien MARGAIL's avatar Julien MARGAIL
Browse files

Merge branch 'feat/content-news' into 'main'

Feat/content news

See merge request onegeo-suite/libs/gatsby-theme-onegeo!10
parents 84ab55e1 e55c5d10
No related branches found
No related tags found
No related merge requests found
......@@ -3,6 +3,7 @@
*/
import React from "react"
import { PageProps } from "gatsby"
import { twMerge } from "tailwind-merge"
interface Props {
children: React.ReactNode
......@@ -21,10 +22,10 @@ const Content = ({
style = {},
}: Props): JSX.Element => {
return (
<div className={"mx-auto max-w-4xl pb-10 " + className} style={style}>
<div className={twMerge("mx-auto max-w-4xl pb-10", className)} style={style}>
{children}
</div>
)
}
export default Content
export default Content
\ No newline at end of file
......@@ -106,4 +106,4 @@ export const query = graphql`
}
}
}
`
`
\ No newline at end of file
......@@ -108,7 +108,7 @@ const News = ({ pageContext, data, location }: PageProps<Idata>) => {
return (
<Layout>
<Content className="pt-8">
<Content className="mx-64 pt-8 max-w-none">
<div className="bg-base-100 rounded-xl p-6 shadow-lg">
<Button
aria-label="Retour"
......@@ -131,7 +131,7 @@ const News = ({ pageContext, data, location }: PageProps<Idata>) => {
<Badge title={categoryName} className="badge-lg mt-2" />
</div>
<div className="mt-8 mb-8 flex flex-wrap gap-6 md:flex-nowrap">
<div className="mb-8 mt-8 flex flex-wrap gap-6 md:flex-nowrap">
{position === "left" ? (
<SideBar documents={documents} links={links} />
) : null}
......@@ -229,4 +229,4 @@ export const query = graphql`
}
}
}
`
`
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment