From ee9a9a67fc687672563238d58e021958a7560161 Mon Sep 17 00:00:00 2001 From: DrMint Date: Wed, 21 Sep 2022 18:12:04 +0200 Subject: [PATCH] Some tailwind simplification --- design.config.js | 1 + src/components/AppLayout.tsx | 10 +++++----- src/pages/wiki/[slug]/index.tsx | 2 +- src/pages/wiki/chronology.tsx | 2 +- src/pages/wiki/index.tsx | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/design.config.js b/design.config.js index 6bbc07e..104ac2e 100644 --- a/design.config.js +++ b/design.config.js @@ -42,6 +42,7 @@ const layout = { mainMenuReduced: 6, mainMenu: 20, subMenu: 20, + navbar: 5, }; module.exports = { diff --git a/src/components/AppLayout.tsx b/src/components/AppLayout.tsx index a95fc69..e7852c8 100644 --- a/src/components/AppLayout.tsx +++ b/src/components/AppLayout.tsx @@ -167,7 +167,7 @@ export const AppLayout = ({ className={cJoin( `fixed inset-0 m-0 grid touch-pan-y bg-light p-0 text-black [grid-template-areas:'main_sub_content']`, - cIf(is1ColumnLayout, "grid-rows-[1fr_5rem] [grid-template-areas:'content''navbar']") + cIf(is1ColumnLayout, `grid-rows-[1fr_5rem] [grid-template-areas:'content''navbar']`) )} style={{ gridTemplateColumns: is1ColumnLayout @@ -278,13 +278,13 @@ export const AppLayout = ({ {/* Navbar */}
{ toggleMainPanelOpen(); setSubPanelOpen(false); @@ -302,7 +302,7 @@ export const AppLayout = ({ {isDefined(subPanel) && !turnSubIntoContent && ( { toggleSubPanelOpen(); setMainPanelOpen(false); diff --git a/src/pages/wiki/[slug]/index.tsx b/src/pages/wiki/[slug]/index.tsx index 235b361..fbedac6 100644 --- a/src/pages/wiki/[slug]/index.tsx +++ b/src/pages/wiki/[slug]/index.tsx @@ -90,7 +90,7 @@ const WikiPage = ({ page, ...otherProps }: Props): JSX.Element => {
{page.thumbnail?.data?.attributes && ( )} -

+

{event.source?.data ? ( `(${event.source.data.attributes?.name})` ) : ( diff --git a/src/pages/wiki/index.tsx b/src/pages/wiki/index.tsx index 6098200..b7dd1d2 100644 --- a/src/pages/wiki/index.tsx +++ b/src/pages/wiki/index.tsx @@ -211,7 +211,7 @@ const Wiki = ({ pages, ...otherProps }: Props): JSX.Element => { )} className={cIf( isContentPanelAtLeast4xl, - "grid-cols-[repeat(auto-fill,_minmax(15rem,1fr))] gap-x-6 gap-y-8", + "grid-cols-[repeat(auto-fill,minmax(15rem,1fr))] gap-x-6 gap-y-8", "grid-cols-2 gap-x-3 gap-y-5" )} searchingTerm={searchName}