From 8b8265c18f7d14352d816bc1b1b20d41c906e4bd Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Thu, 14 Dec 2023 12:54:17 -0500 Subject: [PATCH 01/30] create branding page --- pages/about/branding.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) create mode 100644 pages/about/branding.js diff --git a/pages/about/branding.js b/pages/about/branding.js new file mode 100644 index 00000000..9a741fde --- /dev/null +++ b/pages/about/branding.js @@ -0,0 +1,14 @@ +import { + Link, Page +} from '../../components' + +export default function Branding() { + + return ( + + + + ) +} From 8e7f4d9c7461f9ef2d5625017db267e74ccdd086 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Thu, 14 Dec 2023 12:58:56 -0500 Subject: [PATCH 02/30] add brand, color, and typography sections to branding page --- pages/about/branding.js | 37 ++++++++++++++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/pages/about/branding.js b/pages/about/branding.js index 9a741fde..7d137e90 100644 --- a/pages/about/branding.js +++ b/pages/about/branding.js @@ -1,6 +1,7 @@ import { - Link, Page + Link, Page, Section } from '../../components' +import { Typography } from '@mui/material' export default function Branding() { @@ -8,6 +9,40 @@ export default function Branding() { + + Laborum consequat voluptate culpa non non consectetur ut minim consectetur minim duis enim laboris elit consectetur ut. + Consectetur aute tempor culpa fugiat qui anim ut aliqua tempor laboris dolor nulla. + Exercitation laboris consectetur irure aliquip deserunt sint dolore mollit labore adipisicing eu. + Reprehenderit aliqua eu qui quis ut veniam elit adipisicing minim veniam exercitation culpa sit sit est reprehenderit culpa. + + +
+ + Laborum consequat voluptate culpa non non consectetur ut minim consectetur minim duis enim laboris elit consectetur ut. + Consectetur aute tempor culpa fugiat qui anim ut aliqua tempor laboris dolor nulla. + Exercitation laboris consectetur irure aliquip deserunt sint dolore mollit labore adipisicing eu. + Reprehenderit aliqua eu qui quis ut veniam elit adipisicing minim veniam exercitation culpa sit sit est reprehenderit culpa. + +
+ +
+ + Laborum consequat voluptate culpa non non consectetur ut minim consectetur minim duis enim laboris elit consectetur ut. + Consectetur aute tempor culpa fugiat qui anim ut aliqua tempor laboris dolor nulla. + Exercitation laboris consectetur irure aliquip deserunt sint dolore mollit labore adipisicing eu. + Reprehenderit aliqua eu qui quis ut veniam elit adipisicing minim veniam exercitation culpa sit sit est reprehenderit culpa. + +
+ +
+ RENCI's Font Stack + + The font families making up this style guide are Google's Roboto and Open Sans fonts, used for + headings and paragraphs, respectively. With the RENCI stylesheet, all headings are already + styled to use the heading font—Roboto, and all paragraphs are styled with the paragraph + font—Open Sans. + +
) From 8473c7078995e5430e652eb8e71a4f863151f449 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Thu, 14 Dec 2023 13:32:38 -0500 Subject: [PATCH 03/30] add block component --- components/block.js | 14 ++++++++++++++ components/index.js | 1 + 2 files changed, 15 insertions(+) create mode 100644 components/block.js diff --git a/components/block.js b/components/block.js new file mode 100644 index 00000000..d8d63fe4 --- /dev/null +++ b/components/block.js @@ -0,0 +1,14 @@ +import React from 'react' +import { Paper } from '@mui/material' + +export const Block = ({children}) => { + return ( + + { children } + + ) +} \ No newline at end of file diff --git a/components/index.js b/components/index.js index bdb8deaf..4e4e7015 100644 --- a/components/index.js +++ b/components/index.js @@ -5,3 +5,4 @@ export * from './link-tray' export * from './people' export * from './pre' export * from './markdown' +export * from './block' From e0daaa74f169945db7a9d48609c3d80e43e436b7 Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Thu, 14 Dec 2023 13:33:07 -0500 Subject: [PATCH 04/30] use block component in typography section on branding page --- pages/about/branding.js | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/pages/about/branding.js b/pages/about/branding.js index 7d137e90..4da34811 100644 --- a/pages/about/branding.js +++ b/pages/about/branding.js @@ -1,5 +1,5 @@ import { - Link, Page, Section + Link, Page, Section, Block } from '../../components' import { Typography } from '@mui/material' @@ -42,6 +42,43 @@ export default function Branding() { styled to use the heading font—Roboto, and all paragraphs are styled with the paragraph font—Open Sans. +
+ + Headings +
+ + The heading font is Google's Roboto font. + +
+ + { + ['h1', 'h2', 'h3', 'h4', 'h5',].map(variant => { + return ( + + { variant }: The Quick Brown Fox + + ) + }) + } + +
+ + Paragraphs +
+ + Paragraphs and general blocks of text use Google's Open Sans font. + + + { + ['body1', 'body2'].map(variant => { + return ( + + { variant }: The quick brown fox jumps over the lazy dog. + + ) + }) + } + From 6f5fa9f7d806863d545f92175c76206a9904552b Mon Sep 17 00:00:00 2001 From: suejinkim20 Date: Fri, 15 Dec 2023 10:06:42 -0500 Subject: [PATCH 05/30] update typography --- pages/about/branding.js | 4 ++-- pages/collaborations/[id].js | 8 ++++---- pages/news/[year]/[month]/[day]/[slug].js | 8 ++++---- pages/people/[slug].js | 4 ++-- style/theme.js | 12 ++++-------- 5 files changed, 16 insertions(+), 20 deletions(-) diff --git a/pages/about/branding.js b/pages/about/branding.js index 4da34811..9e316e87 100644 --- a/pages/about/branding.js +++ b/pages/about/branding.js @@ -35,7 +35,7 @@ export default function Branding() {
- RENCI's Font Stack + RENCI's Font Stack The font families making up this style guide are Google's Roboto and Open Sans fonts, used for headings and paragraphs, respectively. With the RENCI stylesheet, all headings are already @@ -52,7 +52,7 @@ export default function Branding() {
{ - ['h1', 'h2', 'h3', 'h4', 'h5',].map(variant => { + ['h1', 'h2', 'h3', 'h4', 'h5'].map(variant => { return ( { variant }: The Quick Brown Fox diff --git a/pages/collaborations/[id].js b/pages/collaborations/[id].js index 39967f5e..943b3d3e 100644 --- a/pages/collaborations/[id].js +++ b/pages/collaborations/[id].js @@ -3,7 +3,7 @@ import { fetchStrapiCollaboration } from '../../lib/strapi' import { Link, Page, PersonCard, PersonGrid, Section, Markdown } from '../../components' -import { Divider } from '@mui/material' +import { Divider, Typography } from '@mui/material' export default function Collaboration({ collaboration }) { return ( @@ -59,7 +59,7 @@ export default function Collaboration({ collaboration }) { }
-

People

+ People { collaboration.members.map(person => ( @@ -71,7 +71,7 @@ export default function Collaboration({ collaboration }) { { collaboration.partners.length > 0 && ( -

Partners

+ Partners