Skip to content

Commit

Permalink
Merge pull request #2103 from 0x346e3730/feat/full-width-main-if-no-s…
Browse files Browse the repository at this point in the history
…idebar

feat(templates): make main full-width if sidebar is empty
  • Loading branch information
AmruthPillai authored Jan 12, 2025
2 parents 26e34b6 + c872421 commit 0fec5ce
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion apps/artboard/src/templates/azurill.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -562,7 +562,7 @@ export const Azurill = ({ columns, isFirstPage = false }: TemplateProps) => {
))}
</div>

<div className="main group col-span-2 space-y-4">
<div className={cn("main group space-y-4", sidebar.length !== 0 ? "col-span-2" : "col-span-3")}>
{main.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
Expand Down
4 changes: 2 additions & 2 deletions apps/artboard/src/templates/chikorita.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -566,15 +566,15 @@ export const Chikorita = ({ columns, isFirstPage = false }: TemplateProps) => {

return (
<div className="grid min-h-[inherit] grid-cols-3">
<div className="main p-custom group col-span-2 space-y-4">
<div className={cn("main p-custom group space-y-4", sidebar.length !== 0 ? "col-span-2" : "col-span-3")}>
{isFirstPage && <Header />}

{main.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
</div>

<div className="sidebar p-custom group h-full space-y-4 bg-primary text-background">
<div className={cn("sidebar p-custom group h-full space-y-4 bg-primary text-background", sidebar.length === 0 && "hidden")}>
{sidebar.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
Expand Down
2 changes: 1 addition & 1 deletion apps/artboard/src/templates/ditto.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ export const Ditto = ({ columns, isFirstPage = false }: TemplateProps) => {
))}
</div>

<div className="main p-custom group col-span-2 space-y-4">
<div className={cn("main p-custom group space-y-4", sidebar.length !== 0 ? "col-span-2" : "col-span-3")}>
{main.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
Expand Down
2 changes: 1 addition & 1 deletion apps/artboard/src/templates/gengar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ export const Gengar = ({ columns, isFirstPage = false }: TemplateProps) => {
</div>
</div>

<div className="main group col-span-2">
<div className={cn("main group", sidebar.length !== 0 ? "col-span-2" : "col-span-3")}>
{isFirstPage && (
<div
className="p-custom space-y-4"
Expand Down
4 changes: 2 additions & 2 deletions apps/artboard/src/templates/glalie.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ export const Glalie = ({ columns, isFirstPage = false }: TemplateProps) => {
return (
<div className="grid min-h-[inherit] grid-cols-3">
<div
className="sidebar p-custom group space-y-4"
className={cn("sidebar p-custom group space-y-4", sidebar.length === 0 && "hidden")}
style={{ backgroundColor: hexToRgb(primaryColor, 0.2) }}
>
{isFirstPage && <Header />}
Expand All @@ -589,7 +589,7 @@ export const Glalie = ({ columns, isFirstPage = false }: TemplateProps) => {
))}
</div>

<div className="main p-custom group col-span-2 space-y-4">
<div className={cn("main p-custom group space-y-4", sidebar.length !== 0 ? "col-span-2" : "col-span-3")}>
{main.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
Expand Down
4 changes: 2 additions & 2 deletions apps/artboard/src/templates/leafish.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -519,13 +519,13 @@ export const Leafish = ({ columns, isFirstPage = false }: TemplateProps) => {
{isFirstPage && <Header />}

<div className="p-custom grid grid-cols-2 items-start space-x-6">
<div className="grid gap-y-4">
<div className={cn("grid gap-y-4", sidebar.length === 0 && "col-span-2")}>
{main.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
</div>

<div className="grid gap-y-4">
<div className={cn("grid gap-y-4", sidebar.length === 0 && "hidden")}>
{sidebar.map((section) => (
<Fragment key={section}>{mapSectionToComponent(section)}</Fragment>
))}
Expand Down
2 changes: 1 addition & 1 deletion apps/artboard/src/templates/pikachu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ export const Pikachu = ({ columns, isFirstPage = false }: TemplateProps) => {
))}
</div>

<div className="main group col-span-2 space-y-4">
<div className={cn("main group space-y-4", sidebar.length !== 0 ? "col-span-2" : "col-span-3")}>
{isFirstPage && <Header />}

{main.map((section) => (
Expand Down

0 comments on commit 0fec5ce

Please sign in to comment.