strtus/Vercel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #134 from Johnomated/main

Browse Source 
Centered Layout
This commit is contained in:
Sam Becker 2024-08-11 11:21:17 -05:00 committed by GitHub
commit 9bb31c9d7a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/app/layout.tsx
View File

@ -4,6 +4,7 @@ import { clsx } from 'clsx/lite';
import { IBM_Plex_Mono } from 'next/font/google';
import {
BASE_URL,
CENTERED_LARGE_SCREENS,
DEFAULT_THEME,
SITE_DESCRIPTION,
SITE_DOMAIN_OR_TITLE,
@ -27,6 +28,8 @@ const ibmPlexMono = IBM_Plex_Mono({
subsets: ['latin'],
weight: ['400', '500', '700'],
variable: '--font-ibm-plex-mono',
display: 'swap', // font wouldn't load in vercel dev environment, solution from link below
// https://stackoverflow.com/a/76484168
});
export const metadata: Metadata = {

4
src/components/Badge.tsx
View File

@ -28,7 +28,9 @@ export default function Badge({
case 'small':
return clsx(
'h-max-baseline',
'px-[5px] py-[2.75px]',
// 'px-[5px] py-[2.75px]', //original padding
'block', // added to keep gray background around text when overflowed
'px-[6px] py-[5px]', // increased padding for block and to stop content shift
'text-[0.7rem] font-medium rounded-[0.25rem]',
highContrast
? 'text-invert bg-invert'

16
src/components/SiteGrid.tsx
View File

@ -1,5 +1,6 @@
import { clsx } from 'clsx/lite';
import { RefObject } from 'react';
import { CENTERED_LARGE_SCREENS } from '@/site/config';
export default function SiteGrid({
containerRef,
@ -25,18 +26,29 @@ export default function SiteGrid({
'gap-x-4 lg:gap-x-6',
'gap-y-4',
'max-w-7xl',
CENTERED_LARGE_SCREENS && 'mx-auto',
className,
)}
>
<div className={clsx(
'col-span-1 md:col-span-9',
// 'col-span-1 md:col-span-9', // original
// 'col-span-1 md:col-span-9 xl:col-start-2', // without env variable
CENTERED_LARGE_SCREENS
// ? 'col-span-1 md:col-span-9 lg:col-start-2' // option for lg screens and up
? 'col-span-1 md:col-span-9 xl:col-start-2'
: 'col-span-1 md:col-span-9',
sideFirstOnMobile && 'order-2 md:order-none',
)}>
{contentMain}
</div>
{contentSide &&
<div className={clsx(
'col-span-1 md:col-span-3',
// 'col-span-1 md:col-span-3', // original
// 'col-span-1 md:col-span-3 xl:col-span-2', // without env variable
CENTERED_LARGE_SCREENS
// ? 'col-span-1 lg:col-span-2' // option for lg screens and up
? 'col-span-1 md:col-span-3 xl:col-span-2'
: 'col-span-1 md:col-span-3',
sideFirstOnMobile && 'order-1 md:order-none',
sideHiddenOnMobile && 'hidden md:block',
)}>

2
src/site/config.ts
View File

@ -155,6 +155,8 @@ export const SHOW_FILM_SIMULATIONS =
process.env.NEXT_PUBLIC_HIDE_FILM_SIMULATIONS !== '1';
export const SHOW_EXIF_DATA =
process.env.NEXT_PUBLIC_HIDE_EXIF_DATA !== '1';
export const CENTERED_LARGE_SCREENS =
process.env.NEXT_PUBLIC_CENTERED_ON_LARGE_SCREENS === '1';
export const GRID_ASPECT_RATIO =
process.env.NEXT_PUBLIC_GRID_ASPECT_RATIO
? parseFloat(process.env.NEXT_PUBLIC_GRID_ASPECT_RATIO)