diff --git a/CHANGELOG.md b/CHANGELOG.md index 48792b32dd73a2f353e836f4f3df0b4403b54370..b452ea0405e758046e070a74170172aca38102f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,18 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [0.11.0] - 2024-01-23 + +### Fix + +- Footer responsive mode +- News template Previous / Next + +### Changed + +- TailwindCSS 3.4 +- tailwind-merge 2.2 + ## [0.10.1] - 2024-01-09 ### Fix diff --git a/gatsby-node.js b/gatsby-node.js index ea8891c805be4d3671bc8e7b8bcf106d912906fe..adc359ef2ded930c0ae3a1576f0074129dc760b8 100644 --- a/gatsby-node.js +++ b/gatsby-node.js @@ -89,8 +89,8 @@ exports.createPages = async function ({ actions, graphql }) { component: require.resolve(`./src/templates/news.tsx`), context: { id: news.id, - prev: data.directus.news.at(i - 1), - next: data.directus.news.at(i + 1), + prev: data.directus.news.at(i + 1), + next: i > 0 ? data.directus.news.at(i - 1) : null, }, }) }) diff --git a/package.json b/package.json index 48634524976863d61452817b745c95dd35b8cd74..eef2d9382aed4d612933042594cc12a3131d3c6d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@onegeo-suite/gatsby-theme-onegeo", - "version": "0.10.1", + "version": "0.11.0", "main": "index.js", "types": "index.d.ts", "author": "NEOGEO", @@ -12,7 +12,7 @@ }, "peerDependencies": { "gatsby": "^4.0.0", - "tailwindcss": "^3.0.0", + "tailwindcss": "^3.4.0", "typescript": "^4.0.0" }, "dependencies": { @@ -25,7 +25,7 @@ "react-cookie-consent": "^8.0.1", "react-leaflet": "^3.2.5", "swiper": "^8.4.5", - "tailwind-merge": "^1.10.0" + "tailwind-merge": "^2.2.0" }, "devDependencies": { "dotenv": "^10.0.0" diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx index d8a2e77fc13e88f736e6741fb9ce6f4b99600aa6..fc99e6a65045585b4e7ebc441834dddb1501df12 100644 --- a/src/components/Footer.tsx +++ b/src/components/Footer.tsx @@ -43,14 +43,17 @@ const Footer = (props: Props) => { return ( <footer className={twMerge( - "footer bg-base-300 absolute bottom-0 h-24 w-full items-center px-4", + "footer bg-base-300 absolute bottom-0 min-h-24 w-full items-center gap-y-0 px-4 ", className, oClass.main )} data-theme={theme} > <div - className={twMerge("grid-flow-col items-center", oClass.start)} + className={twMerge( + "grid-flow-col justify-self-center lg:justify-self-start", + oClass.start + )} > <Logo title="" image={logo} url="/" /> </div> @@ -63,7 +66,7 @@ const Footer = (props: Props) => { </div> <div className={twMerge( - "grid-flow-col gap-4 md:place-self-center md:justify-self-end", + "grid-flow-col gap-4 justify-self-center lg:justify-self-end", oClass.end )} > diff --git a/src/templates/news.tsx b/src/templates/news.tsx index a146fcf71ff5f39da5173529d5a472dab1330645..1ac3fbfebede8248ce91ed60c2c02b536d98fece 100644 --- a/src/templates/news.tsx +++ b/src/templates/news.tsx @@ -113,19 +113,21 @@ const News = ({ pageContext, data, location }: PageProps<Idata>) => { </div> <div className="mb-24 flex justify-center"> <div className="flex w-5/6 space-x-4"> - <Card - url={"/news/" + pageContext.prev?.slug} - name="Précédent" - description={pageContext.prev?.title} - layout="left" - size="xs" - image={ - pageContext.prev?.image != null - ? pageContext.prev?.image?.imageFile - ?.publicURL - : "mock" - } - /> + {pageContext.prev ? ( + <Card + url={"/news/" + pageContext.prev?.slug} + name="Précédent" + description={pageContext.prev?.title} + layout="left" + size="xs" + image={ + pageContext.prev?.image != null + ? pageContext.prev?.image?.imageFile + ?.publicURL + : "mock" + } + /> + ) : null} {pageContext.next ? ( <Card url={"/news/" + pageContext.next?.slug}