From 7a2a4da3b510a9e1fa84f4378b05760dee5faac5 Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Thu, 23 Nov 2023 00:52:47 +0000 Subject: [PATCH 1/8] Make Heading responsive --- src/@chakra-ui/gatsby-plugin/theme.ts | 42 +-- src/components/page-hero.tsx | 2 +- src/gatsby-types.d.ts | 356 -------------------------- 3 files changed, 23 insertions(+), 377 deletions(-) diff --git a/src/@chakra-ui/gatsby-plugin/theme.ts b/src/@chakra-ui/gatsby-plugin/theme.ts index 4fd63b5ca..4c38c6ce2 100644 --- a/src/@chakra-ui/gatsby-plugin/theme.ts +++ b/src/@chakra-ui/gatsby-plugin/theme.ts @@ -19,6 +19,8 @@ const theme = { styles: { global: { body: { + fontSize: ['1rem', null, null, '1.25rem'], + lineHeight: 'calc(0.5rem + 1em)', color: 'base.500' } } @@ -40,37 +42,37 @@ const theme = { textTransform: 'uppercase' }, sizes: { - xxs: { - fontSize: '1rem', - lineHeight: '1.5rem' - }, xs: { - fontSize: '1.25rem', - lineHeight: '1.75rem' + fontSize: ['0.75rem', null, null, '1rem'], + lineHeight: 'calc(0.5rem + 1em)' }, sm: { - fontSize: '1.5rem', - lineHeight: '2rem' + fontSize: ['1rem', null, null, '1.25rem'], + lineHeight: 'calc(0.5rem + 1em)' }, md: { - fontSize: '1.75rem', - lineHeight: '2.25rem' + fontSize: ['1.25rem', null, null, '1.5rem'], + lineHeight: 'calc(0.5rem + 1em)' }, lg: { - fontSize: '2rem', - lineHeight: '2.5rem' + fontSize: ['1.5rem', null, null, '1.75rem'], + lineHeight: 'calc(0.5rem + 1em)' }, xl: { - fontSize: '2.25rem', - lineHeight: '2.75rem' + fontSize: ['1.75rem', null, null, '2rem'], + lineHeight: 'calc(0.5rem + 1em)' + }, + '2xlg': { + fontSize: ['2rem', null, null, '2.25rem'], + lineHeight: 'calc(0.5rem + 1em)' }, - xxl: { - fontSize: '2.5rem', - lineHeight: '3rem' + '3xlg': { + fontSize: ['2.25rem', null, null, '2.5rem'], + lineHeight: 'calc(0.5rem + 1em)' }, - jumbo: { - fontSize: '3.25rem', - lineHeight: '3.75rem' + '4xl': { + fontSize: ['2.5rem', null, null, '2.75rem'], + lineHeight: 'calc(0.5rem + 1em)' } } }, diff --git a/src/components/page-hero.tsx b/src/components/page-hero.tsx index 75c351b76..f58712e80 100644 --- a/src/components/page-hero.tsx +++ b/src/components/page-hero.tsx @@ -42,7 +42,7 @@ export default function PageHero(props: PageHeroProps) { p='0' > - {title} + {title} {lead && ( {lead} diff --git a/src/gatsby-types.d.ts b/src/gatsby-types.d.ts index 2d8b8e235..dbc31919c 100644 --- a/src/gatsby-types.d.ts +++ b/src/gatsby-types.d.ts @@ -1659,7 +1659,6 @@ type Query = { readonly allSitePage: SitePageConnection; readonly allSitePlugin: SitePluginConnection; readonly allSponsor: SponsorConnection; - readonly allStaticImage: StaticImageConnection; readonly directory: Maybe; readonly file: Maybe; readonly imageSharp: Maybe; @@ -1671,7 +1670,6 @@ type Query = { readonly sitePage: Maybe; readonly sitePlugin: Maybe; readonly sponsor: Maybe; - readonly staticImage: Maybe; }; @@ -1763,14 +1761,6 @@ type Query_allSponsorArgs = { }; -type Query_allStaticImageArgs = { - filter: InputMaybe; - limit: InputMaybe; - skip: InputMaybe; - sort: InputMaybe>>; -}; - - type Query_directoryArgs = { absolutePath: InputMaybe; accessTime: InputMaybe; @@ -1985,46 +1975,6 @@ type Query_sponsorArgs = { url: InputMaybe; }; - -type Query_staticImageArgs = { - absolutePath: InputMaybe; - accessTime: InputMaybe; - atime: InputMaybe; - atimeMs: InputMaybe; - base: InputMaybe; - birthTime: InputMaybe; - birthtime: InputMaybe; - birthtimeMs: InputMaybe; - blksize: InputMaybe; - blocks: InputMaybe; - changeTime: InputMaybe; - children: InputMaybe; - ctime: InputMaybe; - ctimeMs: InputMaybe; - dev: InputMaybe; - dir: InputMaybe; - ext: InputMaybe; - extension: InputMaybe; - id: InputMaybe; - ino: InputMaybe; - internal: InputMaybe; - mode: InputMaybe; - modifiedTime: InputMaybe; - mtime: InputMaybe; - mtimeMs: InputMaybe; - name: InputMaybe; - nlink: InputMaybe; - parent: InputMaybe; - prettySize: InputMaybe; - rdev: InputMaybe; - relativeDirectory: InputMaybe; - relativePath: InputMaybe; - root: InputMaybe; - size: InputMaybe; - sourceInstanceName: InputMaybe; - uid: InputMaybe; -}; - type Site = Node & { readonly buildTime: Maybe; readonly children: ReadonlyArray; @@ -2997,312 +2947,6 @@ type SponsorSortInput = { readonly url: InputMaybe; }; -type StaticImage = Node & { - readonly absolutePath: Maybe; - readonly accessTime: Maybe; - readonly atime: Maybe; - readonly atimeMs: Maybe; - readonly base: Maybe; - readonly birthTime: Maybe; - readonly birthtime: Maybe; - readonly birthtimeMs: Maybe; - readonly blksize: Maybe; - readonly blocks: Maybe; - readonly changeTime: Maybe; - readonly children: ReadonlyArray; - readonly ctime: Maybe; - readonly ctimeMs: Maybe; - readonly dev: Maybe; - readonly dir: Maybe; - readonly ext: Maybe; - readonly extension: Maybe; - readonly id: Scalars['ID']; - readonly ino: Maybe; - readonly internal: Internal; - readonly mode: Maybe; - readonly modifiedTime: Maybe; - readonly mtime: Maybe; - readonly mtimeMs: Maybe; - readonly name: Maybe; - readonly nlink: Maybe; - readonly parent: Maybe; - readonly prettySize: Maybe; - readonly rdev: Maybe; - readonly relativeDirectory: Maybe; - readonly relativePath: Maybe; - readonly root: Maybe; - readonly size: Maybe; - readonly sourceInstanceName: Maybe; - readonly uid: Maybe; -}; - - -type StaticImage_accessTimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_atimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_birthTimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_birthtimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_changeTimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_ctimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_modifiedTimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - - -type StaticImage_mtimeArgs = { - difference: InputMaybe; - formatString: InputMaybe; - fromNow: InputMaybe; - locale: InputMaybe; -}; - -type StaticImageConnection = { - readonly distinct: ReadonlyArray; - readonly edges: ReadonlyArray; - readonly group: ReadonlyArray; - readonly max: Maybe; - readonly min: Maybe; - readonly nodes: ReadonlyArray; - readonly pageInfo: PageInfo; - readonly sum: Maybe; - readonly totalCount: Scalars['Int']; -}; - - -type StaticImageConnection_distinctArgs = { - field: StaticImageFieldSelector; -}; - - -type StaticImageConnection_groupArgs = { - field: StaticImageFieldSelector; - limit: InputMaybe; - skip: InputMaybe; -}; - - -type StaticImageConnection_maxArgs = { - field: StaticImageFieldSelector; -}; - - -type StaticImageConnection_minArgs = { - field: StaticImageFieldSelector; -}; - - -type StaticImageConnection_sumArgs = { - field: StaticImageFieldSelector; -}; - -type StaticImageEdge = { - readonly next: Maybe; - readonly node: StaticImage; - readonly previous: Maybe; -}; - -type StaticImageFieldSelector = { - readonly absolutePath: InputMaybe; - readonly accessTime: InputMaybe; - readonly atime: InputMaybe; - readonly atimeMs: InputMaybe; - readonly base: InputMaybe; - readonly birthTime: InputMaybe; - readonly birthtime: InputMaybe; - readonly birthtimeMs: InputMaybe; - readonly blksize: InputMaybe; - readonly blocks: InputMaybe; - readonly changeTime: InputMaybe; - readonly children: InputMaybe; - readonly ctime: InputMaybe; - readonly ctimeMs: InputMaybe; - readonly dev: InputMaybe; - readonly dir: InputMaybe; - readonly ext: InputMaybe; - readonly extension: InputMaybe; - readonly id: InputMaybe; - readonly ino: InputMaybe; - readonly internal: InputMaybe; - readonly mode: InputMaybe; - readonly modifiedTime: InputMaybe; - readonly mtime: InputMaybe; - readonly mtimeMs: InputMaybe; - readonly name: InputMaybe; - readonly nlink: InputMaybe; - readonly parent: InputMaybe; - readonly prettySize: InputMaybe; - readonly rdev: InputMaybe; - readonly relativeDirectory: InputMaybe; - readonly relativePath: InputMaybe; - readonly root: InputMaybe; - readonly size: InputMaybe; - readonly sourceInstanceName: InputMaybe; - readonly uid: InputMaybe; -}; - -type StaticImageFilterInput = { - readonly absolutePath: InputMaybe; - readonly accessTime: InputMaybe; - readonly atime: InputMaybe; - readonly atimeMs: InputMaybe; - readonly base: InputMaybe; - readonly birthTime: InputMaybe; - readonly birthtime: InputMaybe; - readonly birthtimeMs: InputMaybe; - readonly blksize: InputMaybe; - readonly blocks: InputMaybe; - readonly changeTime: InputMaybe; - readonly children: InputMaybe; - readonly ctime: InputMaybe; - readonly ctimeMs: InputMaybe; - readonly dev: InputMaybe; - readonly dir: InputMaybe; - readonly ext: InputMaybe; - readonly extension: InputMaybe; - readonly id: InputMaybe; - readonly ino: InputMaybe; - readonly internal: InputMaybe; - readonly mode: InputMaybe; - readonly modifiedTime: InputMaybe; - readonly mtime: InputMaybe; - readonly mtimeMs: InputMaybe; - readonly name: InputMaybe; - readonly nlink: InputMaybe; - readonly parent: InputMaybe; - readonly prettySize: InputMaybe; - readonly rdev: InputMaybe; - readonly relativeDirectory: InputMaybe; - readonly relativePath: InputMaybe; - readonly root: InputMaybe; - readonly size: InputMaybe; - readonly sourceInstanceName: InputMaybe; - readonly uid: InputMaybe; -}; - -type StaticImageGroupConnection = { - readonly distinct: ReadonlyArray; - readonly edges: ReadonlyArray; - readonly field: Scalars['String']; - readonly fieldValue: Maybe; - readonly group: ReadonlyArray; - readonly max: Maybe; - readonly min: Maybe; - readonly nodes: ReadonlyArray; - readonly pageInfo: PageInfo; - readonly sum: Maybe; - readonly totalCount: Scalars['Int']; -}; - - -type StaticImageGroupConnection_distinctArgs = { - field: StaticImageFieldSelector; -}; - - -type StaticImageGroupConnection_groupArgs = { - field: StaticImageFieldSelector; - limit: InputMaybe; - skip: InputMaybe; -}; - - -type StaticImageGroupConnection_maxArgs = { - field: StaticImageFieldSelector; -}; - - -type StaticImageGroupConnection_minArgs = { - field: StaticImageFieldSelector; -}; - - -type StaticImageGroupConnection_sumArgs = { - field: StaticImageFieldSelector; -}; - -type StaticImageSortInput = { - readonly absolutePath: InputMaybe; - readonly accessTime: InputMaybe; - readonly atime: InputMaybe; - readonly atimeMs: InputMaybe; - readonly base: InputMaybe; - readonly birthTime: InputMaybe; - readonly birthtime: InputMaybe; - readonly birthtimeMs: InputMaybe; - readonly blksize: InputMaybe; - readonly blocks: InputMaybe; - readonly changeTime: InputMaybe; - readonly children: InputMaybe; - readonly ctime: InputMaybe; - readonly ctimeMs: InputMaybe; - readonly dev: InputMaybe; - readonly dir: InputMaybe; - readonly ext: InputMaybe; - readonly extension: InputMaybe; - readonly id: InputMaybe; - readonly ino: InputMaybe; - readonly internal: InputMaybe; - readonly mode: InputMaybe; - readonly modifiedTime: InputMaybe; - readonly mtime: InputMaybe; - readonly mtimeMs: InputMaybe; - readonly name: InputMaybe; - readonly nlink: InputMaybe; - readonly parent: InputMaybe; - readonly prettySize: InputMaybe; - readonly rdev: InputMaybe; - readonly relativeDirectory: InputMaybe; - readonly relativePath: InputMaybe; - readonly root: InputMaybe; - readonly size: InputMaybe; - readonly sourceInstanceName: InputMaybe; - readonly uid: InputMaybe; -}; - type StringQueryOperatorInput = { readonly eq: InputMaybe; readonly glob: InputMaybe; From 8727e482ac3ecc5ec1320826360a77c33fa01606 Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Thu, 23 Nov 2023 16:15:16 +0000 Subject: [PATCH 2/8] Update theme text and heading size --- src/@chakra-ui/gatsby-plugin/theme.ts | 42 ++++++++++++++++++--------- src/templates/letter-page.tsx | 10 +++---- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/src/@chakra-ui/gatsby-plugin/theme.ts b/src/@chakra-ui/gatsby-plugin/theme.ts index 4c38c6ce2..f719dd9ef 100644 --- a/src/@chakra-ui/gatsby-plugin/theme.ts +++ b/src/@chakra-ui/gatsby-plugin/theme.ts @@ -16,10 +16,26 @@ const theme = { body: 'Barlow, sans-serif', heading: 'Barlow Condensed, serif' }, + fontSizes: { + xs: '0.75rem', + sm: '1rem', + md: '1.25rem', + lg: '1.5rem', + xl: '1.75rem', + '2xl': '2rem', + '3xl': '2.25rem', + '4xl': '2.5rem', + '5xl': '2.75rem', + '6xl': '3rem', + '7xl': '3.25rem', + '8xl': '3.5rem', + '9xl': '3.75rem', + '10xl': '4rem' + }, styles: { global: { body: { - fontSize: ['1rem', null, null, '1.25rem'], + fontSize: ['sm', null, null, 'md'], lineHeight: 'calc(0.5rem + 1em)', color: 'base.500' } @@ -28,10 +44,10 @@ const theme = { textStyles: { lead: { sm: { - fontSize: '1.25rem' + fontSize: 'md' }, lg: { - fontSize: '1.5rem' + fontSize: 'lg' } } }, @@ -43,35 +59,35 @@ const theme = { }, sizes: { xs: { - fontSize: ['0.75rem', null, null, '1rem'], + fontSize: ['xs', null, null, 'sm'], lineHeight: 'calc(0.5rem + 1em)' }, sm: { - fontSize: ['1rem', null, null, '1.25rem'], + fontSize: ['sm', null, null, 'md'], lineHeight: 'calc(0.5rem + 1em)' }, md: { - fontSize: ['1.25rem', null, null, '1.5rem'], + fontSize: ['md', null, null, 'lg'], lineHeight: 'calc(0.5rem + 1em)' }, lg: { - fontSize: ['1.5rem', null, null, '1.75rem'], + fontSize: ['lg', null, null, 'xl'], lineHeight: 'calc(0.5rem + 1em)' }, xl: { - fontSize: ['1.75rem', null, null, '2rem'], + fontSize: ['xl', null, null, '2xl'], lineHeight: 'calc(0.5rem + 1em)' }, - '2xlg': { - fontSize: ['2rem', null, null, '2.25rem'], + '2xl': { + fontSize: ['2xl', null, null, '3xl'], lineHeight: 'calc(0.5rem + 1em)' }, - '3xlg': { - fontSize: ['2.25rem', null, null, '2.5rem'], + '3xl': { + fontSize: ['3xl', null, null, '4xl'], lineHeight: 'calc(0.5rem + 1em)' }, '4xl': { - fontSize: ['2.5rem', null, null, '2.75rem'], + fontSize: ['4xl', null, null, '5xl'], lineHeight: 'calc(0.5rem + 1em)' } } diff --git a/src/templates/letter-page.tsx b/src/templates/letter-page.tsx index 778de22c0..63ada8f71 100644 --- a/src/templates/letter-page.tsx +++ b/src/templates/letter-page.tsx @@ -33,12 +33,12 @@ export default function LetterPage(props: PageProps) { > , - h2: (props) => , - h3: (props) => , - h4: (props) => , + h1: (props) => , + h2: (props) => , + h3: (props) => , + h4: (props) => , h5: (props) => , - h6: (props) => , + h6: (props) => , p: (props) => , ul: (props) => , ol: (props) => , From 2ffa58de243bb79e02074a0c0d4b340ca2e42a0f Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Fri, 24 Nov 2023 15:16:41 +0000 Subject: [PATCH 3/8] Normalize header and footer logo --- src/components/brand.tsx | 47 +++++++++++++------ .../{logo-icon.tsx => logo-mark.tsx} | 10 ++-- src/components/page-footer.tsx | 18 +------ src/components/page-header.tsx | 4 +- 4 files changed, 41 insertions(+), 38 deletions(-) rename src/components/{logo-icon.tsx => logo-mark.tsx} (74%) diff --git a/src/components/brand.tsx b/src/components/brand.tsx index 2d13e07fd..3db281113 100644 --- a/src/components/brand.tsx +++ b/src/components/brand.tsx @@ -1,9 +1,15 @@ import React from 'react'; import { useStaticQuery, graphql, Link } from 'gatsby'; -import { Text, Link as ChLink } from '@chakra-ui/react'; -import LogoIcon from './logo-icon'; +import { Heading, Text, Link as ChLink } from '@chakra-ui/react'; +import LogoMark from './logo-mark'; + +interface BrandProps { + variation?: 'positive' | 'negative'; +} + +export default function Brand(props: BrandProps) { + const { variation = 'positive' } = props; -export default function Brand() { const data = useStaticQuery(graphql` query { site { @@ -16,34 +22,45 @@ export default function Brand() { `); return ( - + - - - {data.site.siteMetadata.title}{' '} + + + {data.site.siteMetadata.title}{' '} @@ -51,6 +68,6 @@ export default function Brand() { - + ); } diff --git a/src/components/logo-icon.tsx b/src/components/logo-mark.tsx similarity index 74% rename from src/components/logo-icon.tsx rename to src/components/logo-mark.tsx index 1d2378b6c..32c770e88 100644 --- a/src/components/logo-icon.tsx +++ b/src/components/logo-mark.tsx @@ -1,13 +1,13 @@ -import { useToken } from '@chakra-ui/react'; +import { chakra, useToken } from '@chakra-ui/react'; import React from 'react'; export default function LogoIcon({ color }: { color: string }) { const [userColor, fallbackColor] = useToken('colors', [color, 'primary.500']); return ( - - + ); } diff --git a/src/components/page-footer.tsx b/src/components/page-footer.tsx index fc738cf28..77f4dcfbf 100644 --- a/src/components/page-footer.tsx +++ b/src/components/page-footer.tsx @@ -12,7 +12,6 @@ import { import { Fold } from './fold'; import SmartLink, { SmartLinkProps } from './smart-link'; import { graphql, useStaticQuery } from 'gatsby'; -import LogoIcon from './logo-icon'; import { CollecticonArrowRight, CollecticonBrandLinkedin, @@ -21,6 +20,7 @@ import { CollecticonEnvelope, CollecticonExpandTopRight } from '@devseed-ui/collecticons-chakra'; +import Brand from './brand'; function FooterLink(props: SmartLinkProps) { return ( @@ -40,17 +40,6 @@ function FooterBlock(props: FlexProps) { } export default function PageHeader() { - const data = useStaticQuery(graphql` - query { - site { - siteMetadata { - title - edition - } - } - } - `); - return ( @@ -161,10 +150,7 @@ export default function PageHeader() { lg: '10/ span 3' }} > - - - {data.site.siteMetadata.title} {data.site.siteMetadata.edition} - + An event by{' '} diff --git a/src/components/page-header.tsx b/src/components/page-header.tsx index f64fd9a68..5d4e2f36a 100644 --- a/src/components/page-header.tsx +++ b/src/components/page-header.tsx @@ -6,9 +6,9 @@ export default function PageHeader() { return ( - + - + From 0f26529e050ee430f2bbb2d2ad6fd3df549cb89c Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Fri, 24 Nov 2023 16:13:17 +0000 Subject: [PATCH 4/8] Include menu link and apply into footer --- src/components/menu-link.tsx | 30 ++++++++++++++ src/components/page-footer.tsx | 75 +++++++++++++++++----------------- 2 files changed, 67 insertions(+), 38 deletions(-) create mode 100644 src/components/menu-link.tsx diff --git a/src/components/menu-link.tsx b/src/components/menu-link.tsx new file mode 100644 index 000000000..677a5b148 --- /dev/null +++ b/src/components/menu-link.tsx @@ -0,0 +1,30 @@ +import React from 'react'; +import { LinkProps } from '@chakra-ui/react'; +import SmartLink from './smart-link'; + +export interface SmartLinkProps extends LinkProps { + to: string; +} + +export default React.forwardRef( + function MenuLink(props, ref) { + return ( + + ); + } +); diff --git a/src/components/page-footer.tsx b/src/components/page-footer.tsx index 77f4dcfbf..4bcf1dcc9 100644 --- a/src/components/page-footer.tsx +++ b/src/components/page-footer.tsx @@ -11,7 +11,6 @@ import { } from '@chakra-ui/react'; import { Fold } from './fold'; import SmartLink, { SmartLinkProps } from './smart-link'; -import { graphql, useStaticQuery } from 'gatsby'; import { CollecticonArrowRight, CollecticonBrandLinkedin, @@ -21,19 +20,7 @@ import { CollecticonExpandTopRight } from '@devseed-ui/collecticons-chakra'; import Brand from './brand'; - -function FooterLink(props: SmartLinkProps) { - return ( - - ); -} +import MenuLink from './menu-link'; function FooterBlock(props: FlexProps) { return ; @@ -54,19 +41,19 @@ export default function PageHeader() { Browse - + Welcome - + - + Code of conduct - + - + Terms & Conditions - + @@ -81,28 +68,28 @@ export default function PageHeader() { Past Editions - + Satsummit 2022 - + - + Satsummit 2018 - + - + Satsummit 2017 - + - + Satsummit 2015 - + @@ -117,28 +104,34 @@ export default function PageHeader() { Let's Connect - + Get in Touch - + - + Follow us on X - + - + Find us on Github - + - + Connect through LinkedIn - + @@ -153,11 +146,17 @@ export default function PageHeader() { An event by{' '} - + Development Seed {' '} and{' '} - + DevGlobal . From 5dba74836049502aadaab04bf34e3f9e7909f651 Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Fri, 24 Nov 2023 16:28:28 +0000 Subject: [PATCH 5/8] Normalize global line-height --- src/@chakra-ui/gatsby-plugin/theme.ts | 4 +++- src/components/brand.tsx | 3 +-- src/components/menu-link.tsx | 1 - src/components/page-footer.tsx | 22 +++++++--------------- 4 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/@chakra-ui/gatsby-plugin/theme.ts b/src/@chakra-ui/gatsby-plugin/theme.ts index f719dd9ef..1627e8e5f 100644 --- a/src/@chakra-ui/gatsby-plugin/theme.ts +++ b/src/@chakra-ui/gatsby-plugin/theme.ts @@ -36,8 +36,10 @@ const theme = { global: { body: { fontSize: ['sm', null, null, 'md'], - lineHeight: 'calc(0.5rem + 1em)', color: 'base.500' + }, + '*': { + lineHeight: 'calc(0.5rem + 1em)' } } }, diff --git a/src/components/brand.tsx b/src/components/brand.tsx index 3db281113..75cf92ea2 100644 --- a/src/components/brand.tsx +++ b/src/components/brand.tsx @@ -43,7 +43,6 @@ export default function Brand(props: BrandProps) { diff --git a/src/components/menu-link.tsx b/src/components/menu-link.tsx index 677a5b148..8a5f3af5c 100644 --- a/src/components/menu-link.tsx +++ b/src/components/menu-link.tsx @@ -16,7 +16,6 @@ export default React.forwardRef( fontFamily='Barlow Condensed, serif' fontWeight='600' fontSize='sm' - lineHeight='calc(0.5rem + 1em)' textTransform='uppercase' transition='opacity 0.24s ease 0s' _hover={{ diff --git a/src/components/page-footer.tsx b/src/components/page-footer.tsx index 4bcf1dcc9..7d7bf06b2 100644 --- a/src/components/page-footer.tsx +++ b/src/components/page-footer.tsx @@ -38,7 +38,7 @@ export default function PageHeader() { lg: '1/ span 3' }} > - Browse + Browse @@ -65,7 +65,7 @@ export default function PageHeader() { lg: '4/ span 3' }} > - Past Editions + Past Editions @@ -101,7 +101,7 @@ export default function PageHeader() { lg: '7/ span 3' }} > - Let's Connect + Let's Connect @@ -144,26 +144,18 @@ export default function PageHeader() { }} > - + An event by{' '} - + Development Seed {' '} and{' '} - + DevGlobal . - - Terms & Conditions © 2015-{new Date().getFullYear()} - + © 2015-{new Date().getFullYear()} From 469f032041364efa8e76c5538ff1415d44409fda Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Fri, 24 Nov 2023 16:42:28 +0000 Subject: [PATCH 6/8] Normalize homepage heading size --- src/gatsby-types.d.ts | 356 ++++++++++++++++++++++++++++++++++++++++++ src/pages/index.tsx | 6 +- 2 files changed, 359 insertions(+), 3 deletions(-) diff --git a/src/gatsby-types.d.ts b/src/gatsby-types.d.ts index dbc31919c..2d8b8e235 100644 --- a/src/gatsby-types.d.ts +++ b/src/gatsby-types.d.ts @@ -1659,6 +1659,7 @@ type Query = { readonly allSitePage: SitePageConnection; readonly allSitePlugin: SitePluginConnection; readonly allSponsor: SponsorConnection; + readonly allStaticImage: StaticImageConnection; readonly directory: Maybe; readonly file: Maybe; readonly imageSharp: Maybe; @@ -1670,6 +1671,7 @@ type Query = { readonly sitePage: Maybe; readonly sitePlugin: Maybe; readonly sponsor: Maybe; + readonly staticImage: Maybe; }; @@ -1761,6 +1763,14 @@ type Query_allSponsorArgs = { }; +type Query_allStaticImageArgs = { + filter: InputMaybe; + limit: InputMaybe; + skip: InputMaybe; + sort: InputMaybe>>; +}; + + type Query_directoryArgs = { absolutePath: InputMaybe; accessTime: InputMaybe; @@ -1975,6 +1985,46 @@ type Query_sponsorArgs = { url: InputMaybe; }; + +type Query_staticImageArgs = { + absolutePath: InputMaybe; + accessTime: InputMaybe; + atime: InputMaybe; + atimeMs: InputMaybe; + base: InputMaybe; + birthTime: InputMaybe; + birthtime: InputMaybe; + birthtimeMs: InputMaybe; + blksize: InputMaybe; + blocks: InputMaybe; + changeTime: InputMaybe; + children: InputMaybe; + ctime: InputMaybe; + ctimeMs: InputMaybe; + dev: InputMaybe; + dir: InputMaybe; + ext: InputMaybe; + extension: InputMaybe; + id: InputMaybe; + ino: InputMaybe; + internal: InputMaybe; + mode: InputMaybe; + modifiedTime: InputMaybe; + mtime: InputMaybe; + mtimeMs: InputMaybe; + name: InputMaybe; + nlink: InputMaybe; + parent: InputMaybe; + prettySize: InputMaybe; + rdev: InputMaybe; + relativeDirectory: InputMaybe; + relativePath: InputMaybe; + root: InputMaybe; + size: InputMaybe; + sourceInstanceName: InputMaybe; + uid: InputMaybe; +}; + type Site = Node & { readonly buildTime: Maybe; readonly children: ReadonlyArray; @@ -2947,6 +2997,312 @@ type SponsorSortInput = { readonly url: InputMaybe; }; +type StaticImage = Node & { + readonly absolutePath: Maybe; + readonly accessTime: Maybe; + readonly atime: Maybe; + readonly atimeMs: Maybe; + readonly base: Maybe; + readonly birthTime: Maybe; + readonly birthtime: Maybe; + readonly birthtimeMs: Maybe; + readonly blksize: Maybe; + readonly blocks: Maybe; + readonly changeTime: Maybe; + readonly children: ReadonlyArray; + readonly ctime: Maybe; + readonly ctimeMs: Maybe; + readonly dev: Maybe; + readonly dir: Maybe; + readonly ext: Maybe; + readonly extension: Maybe; + readonly id: Scalars['ID']; + readonly ino: Maybe; + readonly internal: Internal; + readonly mode: Maybe; + readonly modifiedTime: Maybe; + readonly mtime: Maybe; + readonly mtimeMs: Maybe; + readonly name: Maybe; + readonly nlink: Maybe; + readonly parent: Maybe; + readonly prettySize: Maybe; + readonly rdev: Maybe; + readonly relativeDirectory: Maybe; + readonly relativePath: Maybe; + readonly root: Maybe; + readonly size: Maybe; + readonly sourceInstanceName: Maybe; + readonly uid: Maybe; +}; + + +type StaticImage_accessTimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_atimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_birthTimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_birthtimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_changeTimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_ctimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_modifiedTimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + + +type StaticImage_mtimeArgs = { + difference: InputMaybe; + formatString: InputMaybe; + fromNow: InputMaybe; + locale: InputMaybe; +}; + +type StaticImageConnection = { + readonly distinct: ReadonlyArray; + readonly edges: ReadonlyArray; + readonly group: ReadonlyArray; + readonly max: Maybe; + readonly min: Maybe; + readonly nodes: ReadonlyArray; + readonly pageInfo: PageInfo; + readonly sum: Maybe; + readonly totalCount: Scalars['Int']; +}; + + +type StaticImageConnection_distinctArgs = { + field: StaticImageFieldSelector; +}; + + +type StaticImageConnection_groupArgs = { + field: StaticImageFieldSelector; + limit: InputMaybe; + skip: InputMaybe; +}; + + +type StaticImageConnection_maxArgs = { + field: StaticImageFieldSelector; +}; + + +type StaticImageConnection_minArgs = { + field: StaticImageFieldSelector; +}; + + +type StaticImageConnection_sumArgs = { + field: StaticImageFieldSelector; +}; + +type StaticImageEdge = { + readonly next: Maybe; + readonly node: StaticImage; + readonly previous: Maybe; +}; + +type StaticImageFieldSelector = { + readonly absolutePath: InputMaybe; + readonly accessTime: InputMaybe; + readonly atime: InputMaybe; + readonly atimeMs: InputMaybe; + readonly base: InputMaybe; + readonly birthTime: InputMaybe; + readonly birthtime: InputMaybe; + readonly birthtimeMs: InputMaybe; + readonly blksize: InputMaybe; + readonly blocks: InputMaybe; + readonly changeTime: InputMaybe; + readonly children: InputMaybe; + readonly ctime: InputMaybe; + readonly ctimeMs: InputMaybe; + readonly dev: InputMaybe; + readonly dir: InputMaybe; + readonly ext: InputMaybe; + readonly extension: InputMaybe; + readonly id: InputMaybe; + readonly ino: InputMaybe; + readonly internal: InputMaybe; + readonly mode: InputMaybe; + readonly modifiedTime: InputMaybe; + readonly mtime: InputMaybe; + readonly mtimeMs: InputMaybe; + readonly name: InputMaybe; + readonly nlink: InputMaybe; + readonly parent: InputMaybe; + readonly prettySize: InputMaybe; + readonly rdev: InputMaybe; + readonly relativeDirectory: InputMaybe; + readonly relativePath: InputMaybe; + readonly root: InputMaybe; + readonly size: InputMaybe; + readonly sourceInstanceName: InputMaybe; + readonly uid: InputMaybe; +}; + +type StaticImageFilterInput = { + readonly absolutePath: InputMaybe; + readonly accessTime: InputMaybe; + readonly atime: InputMaybe; + readonly atimeMs: InputMaybe; + readonly base: InputMaybe; + readonly birthTime: InputMaybe; + readonly birthtime: InputMaybe; + readonly birthtimeMs: InputMaybe; + readonly blksize: InputMaybe; + readonly blocks: InputMaybe; + readonly changeTime: InputMaybe; + readonly children: InputMaybe; + readonly ctime: InputMaybe; + readonly ctimeMs: InputMaybe; + readonly dev: InputMaybe; + readonly dir: InputMaybe; + readonly ext: InputMaybe; + readonly extension: InputMaybe; + readonly id: InputMaybe; + readonly ino: InputMaybe; + readonly internal: InputMaybe; + readonly mode: InputMaybe; + readonly modifiedTime: InputMaybe; + readonly mtime: InputMaybe; + readonly mtimeMs: InputMaybe; + readonly name: InputMaybe; + readonly nlink: InputMaybe; + readonly parent: InputMaybe; + readonly prettySize: InputMaybe; + readonly rdev: InputMaybe; + readonly relativeDirectory: InputMaybe; + readonly relativePath: InputMaybe; + readonly root: InputMaybe; + readonly size: InputMaybe; + readonly sourceInstanceName: InputMaybe; + readonly uid: InputMaybe; +}; + +type StaticImageGroupConnection = { + readonly distinct: ReadonlyArray; + readonly edges: ReadonlyArray; + readonly field: Scalars['String']; + readonly fieldValue: Maybe; + readonly group: ReadonlyArray; + readonly max: Maybe; + readonly min: Maybe; + readonly nodes: ReadonlyArray; + readonly pageInfo: PageInfo; + readonly sum: Maybe; + readonly totalCount: Scalars['Int']; +}; + + +type StaticImageGroupConnection_distinctArgs = { + field: StaticImageFieldSelector; +}; + + +type StaticImageGroupConnection_groupArgs = { + field: StaticImageFieldSelector; + limit: InputMaybe; + skip: InputMaybe; +}; + + +type StaticImageGroupConnection_maxArgs = { + field: StaticImageFieldSelector; +}; + + +type StaticImageGroupConnection_minArgs = { + field: StaticImageFieldSelector; +}; + + +type StaticImageGroupConnection_sumArgs = { + field: StaticImageFieldSelector; +}; + +type StaticImageSortInput = { + readonly absolutePath: InputMaybe; + readonly accessTime: InputMaybe; + readonly atime: InputMaybe; + readonly atimeMs: InputMaybe; + readonly base: InputMaybe; + readonly birthTime: InputMaybe; + readonly birthtime: InputMaybe; + readonly birthtimeMs: InputMaybe; + readonly blksize: InputMaybe; + readonly blocks: InputMaybe; + readonly changeTime: InputMaybe; + readonly children: InputMaybe; + readonly ctime: InputMaybe; + readonly ctimeMs: InputMaybe; + readonly dev: InputMaybe; + readonly dir: InputMaybe; + readonly ext: InputMaybe; + readonly extension: InputMaybe; + readonly id: InputMaybe; + readonly ino: InputMaybe; + readonly internal: InputMaybe; + readonly mode: InputMaybe; + readonly modifiedTime: InputMaybe; + readonly mtime: InputMaybe; + readonly mtimeMs: InputMaybe; + readonly name: InputMaybe; + readonly nlink: InputMaybe; + readonly parent: InputMaybe; + readonly prettySize: InputMaybe; + readonly rdev: InputMaybe; + readonly relativeDirectory: InputMaybe; + readonly relativePath: InputMaybe; + readonly root: InputMaybe; + readonly size: InputMaybe; + readonly sourceInstanceName: InputMaybe; + readonly uid: InputMaybe; +}; + type StringQueryOperatorInput = { readonly eq: InputMaybe; readonly glob: InputMaybe; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index c23989206..fd1e24bd1 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -28,7 +28,7 @@ export default function IndexPage() { gridColumn={{ base: '1/-1', lg: '7/ span 6' }} mt={{ base: '0', lg: '-40' }} > - Save the Date + Save the Date SatSummit convenes leaders in the satellite industry and experts in global development for 2 days of @@ -37,7 +37,7 @@ export default function IndexPage() { data. - Stay Tuned + Stay Tuned From climate change to population growth to natural resource availability, earth observation data offers insights into @@ -78,7 +78,7 @@ export default function IndexPage() { - Become a Sponsor + Become a Sponsor We're excited to partner with thought and industry leaders in the satellite and development communities, and through their From dae7e035e649b02ba6bda6366fc368777ebe559a Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Fri, 24 Nov 2023 16:45:06 +0000 Subject: [PATCH 7/8] Tweak logo appearance --- src/components/brand.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/brand.tsx b/src/components/brand.tsx index 75cf92ea2..64da43494 100644 --- a/src/components/brand.tsx +++ b/src/components/brand.tsx @@ -55,7 +55,7 @@ export default function Brand(props: BrandProps) { _before={{ content: '""', backgroundColor: - variation === 'positive' ? 'base.100a' : 'base.400a', + variation === 'positive' ? 'base.200a' : 'base.400a', position: 'absolute', width: '100%', height: '0.5em', From 06804bab719adb13fae2a43b56c8f83646cd4bcb Mon Sep 17 00:00:00 2001 From: Ricardo Mestre Date: Fri, 24 Nov 2023 16:46:11 +0000 Subject: [PATCH 8/8] Lint --- src/components/page-footer.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/page-footer.tsx b/src/components/page-footer.tsx index 7d7bf06b2..219afef2a 100644 --- a/src/components/page-footer.tsx +++ b/src/components/page-footer.tsx @@ -10,7 +10,7 @@ import { List } from '@chakra-ui/react'; import { Fold } from './fold'; -import SmartLink, { SmartLinkProps } from './smart-link'; +import SmartLink from './smart-link'; import { CollecticonArrowRight, CollecticonBrandLinkedin,