From 4a63ae6b735e0bee8e207524434df8e1c7a079a6 Mon Sep 17 00:00:00 2001 From: Malik Rashad Date: Tue, 11 Jul 2023 08:23:59 -0500 Subject: [PATCH 1/8] initial push --- apps/website/src/pages/_global.astro | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/apps/website/src/pages/_global.astro b/apps/website/src/pages/_global.astro index 2d76fcfb644..dfc32e6df21 100644 --- a/apps/website/src/pages/_global.astro +++ b/apps/website/src/pages/_global.astro @@ -62,22 +62,33 @@ const { content = {} } = Astro.props; max-width: 75ch; } - :where(h1, h2) { - line-height: 1.2; + :where(p) { + padding-block-start: 0.5rem; + padding-block-end: 0.5rem; + } + + :where(h1, h2, h3) { + line-height: 1; } :where(h1) { font-size: var(--type-4); } - :where(h2) { + :where(h2:not(left-sidebar *)) { font-size: var(--type-3); + padding-block-start: 2rem; } :where(h3) { font-size: var(--type-2); + padding-block-start: 1rem; } + // :where(code) { + // padding-block-end: 1rem; + // } + :where(code, pre) { font-family: var(--font-mono); } From ed76e9ba38a01c0b4d903d4ad8b7133c26c48134 Mon Sep 17 00:00:00 2001 From: Malik Rashad Date: Wed, 12 Jul 2023 10:46:08 -0500 Subject: [PATCH 2/8] spacing using variables --- apps/website/src/pages/_global.astro | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/apps/website/src/pages/_global.astro b/apps/website/src/pages/_global.astro index dfc32e6df21..65c82bc0881 100644 --- a/apps/website/src/pages/_global.astro +++ b/apps/website/src/pages/_global.astro @@ -63,8 +63,8 @@ const { content = {} } = Astro.props; } :where(p) { - padding-block-start: 0.5rem; - padding-block-end: 0.5rem; + padding-block-start: var(--space-2); + padding-block-end: var(--space-2); } :where(h1, h2, h3) { @@ -77,18 +77,14 @@ const { content = {} } = Astro.props; :where(h2:not(left-sidebar *)) { font-size: var(--type-3); - padding-block-start: 2rem; + padding-block-start: var(--space-8); } :where(h3) { font-size: var(--type-2); - padding-block-start: 1rem; + padding-block-start: var(--space-5); } - // :where(code) { - // padding-block-end: 1rem; - // } - :where(code, pre) { font-family: var(--font-mono); } From b69693c36da7bab253d79ae2f17b09a835f13258 Mon Sep 17 00:00:00 2001 From: Malik Rashad Date: Wed, 12 Jul 2023 11:38:29 -0500 Subject: [PATCH 3/8] updated spacing --- apps/website/src/pages/_global.astro | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/apps/website/src/pages/_global.astro b/apps/website/src/pages/_global.astro index 65c82bc0881..291af394f09 100644 --- a/apps/website/src/pages/_global.astro +++ b/apps/website/src/pages/_global.astro @@ -63,8 +63,8 @@ const { content = {} } = Astro.props; } :where(p) { - padding-block-start: var(--space-2); - padding-block-end: var(--space-2); + padding-block-start: var(--space-0); + padding-block-end: var(--space-0); } :where(h1, h2, h3) { @@ -75,6 +75,10 @@ const { content = {} } = Astro.props; font-size: var(--type-4); } + :where(h2) { + font-size: var(--type-3); + } + :where(h2:not(left-sidebar *)) { font-size: var(--type-3); padding-block-start: var(--space-8); @@ -82,7 +86,7 @@ const { content = {} } = Astro.props; :where(h3) { font-size: var(--type-2); - padding-block-start: var(--space-5); + padding-block-start: var(--space-3); } :where(code, pre) { From 30abebdcd625a9d095003e3ce7ffaa0aee79246d Mon Sep 17 00:00:00 2001 From: Malik Rashad Date: Mon, 17 Jul 2023 11:44:46 -0500 Subject: [PATCH 4/8] new page dividers with border (work in progress) --- apps/website/src/pages/_global.astro | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/website/src/pages/_global.astro b/apps/website/src/pages/_global.astro index 291af394f09..0e8e3bfc86f 100644 --- a/apps/website/src/pages/_global.astro +++ b/apps/website/src/pages/_global.astro @@ -62,13 +62,8 @@ const { content = {} } = Astro.props; max-width: 75ch; } - :where(p) { - padding-block-start: var(--space-0); - padding-block-end: var(--space-0); - } - - :where(h1, h2, h3) { - line-height: 1; + :where(h1, h2) { + line-height: 1.2; } :where(h1) { @@ -79,14 +74,17 @@ const { content = {} } = Astro.props; font-size: var(--type-3); } - :where(h2:not(left-sidebar *)) { - font-size: var(--type-3); + :where(h2:not(.astro-4EWMQMN4 or left-sidebar)) { + border-top: 1px double var(--color-line-2); + inline-size: 100%; + border-bottom: 1px solid rgb(245 245 245 / 0%); + border-left: 1px solid rgb(245 245 245 / 0%); + border-right: 1px solid rgb(245 245 245 / 0%); padding-block-start: var(--space-8); } :where(h3) { font-size: var(--type-2); - padding-block-start: var(--space-3); } :where(code, pre) { From 4ee9581cc20e0f6d30b3f4928a47bc6b274dc60c Mon Sep 17 00:00:00 2001 From: Malik Rashad Date: Mon, 17 Jul 2023 15:36:27 -0500 Subject: [PATCH 5/8] fixed side nav dividers --- apps/website/src/pages/_global.astro | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/website/src/pages/_global.astro b/apps/website/src/pages/_global.astro index 0e8e3bfc86f..4e009f8d505 100644 --- a/apps/website/src/pages/_global.astro +++ b/apps/website/src/pages/_global.astro @@ -74,8 +74,8 @@ const { content = {} } = Astro.props; font-size: var(--type-3); } - :where(h2:not(.astro-4EWMQMN4 or left-sidebar)) { - border-top: 1px double var(--color-line-2); + :where(h2:not(.astro-4EWMQMN4):not(left-sidebar)) { + border-top: 1px solid var(--color-line-2); inline-size: 100%; border-bottom: 1px solid rgb(245 245 245 / 0%); border-left: 1px solid rgb(245 245 245 / 0%); From b80603b31099d12366fe52b560726a9986083cb2 Mon Sep 17 00:00:00 2001 From: Malik Rashad Date: Wed, 19 Jul 2023 14:24:59 -0500 Subject: [PATCH 6/8] changed page divider to _layout --- apps/website/src/pages/_global.astro | 9 --------- apps/website/src/pages/docs/_layout.astro | 5 +++++ 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/apps/website/src/pages/_global.astro b/apps/website/src/pages/_global.astro index 4e009f8d505..2d76fcfb644 100644 --- a/apps/website/src/pages/_global.astro +++ b/apps/website/src/pages/_global.astro @@ -74,15 +74,6 @@ const { content = {} } = Astro.props; font-size: var(--type-3); } - :where(h2:not(.astro-4EWMQMN4):not(left-sidebar)) { - border-top: 1px solid var(--color-line-2); - inline-size: 100%; - border-bottom: 1px solid rgb(245 245 245 / 0%); - border-left: 1px solid rgb(245 245 245 / 0%); - border-right: 1px solid rgb(245 245 245 / 0%); - padding-block-start: var(--space-8); - } - :where(h3) { font-size: var(--type-2); } diff --git a/apps/website/src/pages/docs/_layout.astro b/apps/website/src/pages/docs/_layout.astro index f95c4cc779a..10f56459c39 100644 --- a/apps/website/src/pages/docs/_layout.astro +++ b/apps/website/src/pages/docs/_layout.astro @@ -106,6 +106,11 @@ const currentPage = new URL(Astro.request.url).pathname; grid-area: h1; } + :global(h2:not(left-sidebar)) { + border-top: 1px solid var(--color-line-2); + padding-block-start: var(--space-8); + } + > :global(.toc-wrapper) { grid-area: toc; padding-inline: var(--space-3); From 8777c9c8016362829e1f15daf9cb52ab5bef3c0e Mon Sep 17 00:00:00 2001 From: Malik Rashad <105806085+marashad001@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:03:43 -0500 Subject: [PATCH 7/8] Update apps/website/src/pages/docs/_layout.astro Co-authored-by: Mayank <9084735+mayank99@users.noreply.github.com> --- apps/website/src/pages/docs/_layout.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/src/pages/docs/_layout.astro b/apps/website/src/pages/docs/_layout.astro index 10f56459c39..845e1d4c272 100644 --- a/apps/website/src/pages/docs/_layout.astro +++ b/apps/website/src/pages/docs/_layout.astro @@ -106,7 +106,7 @@ const currentPage = new URL(Astro.request.url).pathname; grid-area: h1; } - :global(h2:not(left-sidebar)) { + :global(h2) { border-top: 1px solid var(--color-line-2); padding-block-start: var(--space-8); } From 980f58157055bf185a01a5567be198c705fafd6f Mon Sep 17 00:00:00 2001 From: Malik Rashad <105806085+marashad001@users.noreply.github.com> Date: Wed, 19 Jul 2023 16:04:08 -0500 Subject: [PATCH 8/8] Update apps/website/src/pages/docs/_layout.astro Co-authored-by: Mayank <9084735+mayank99@users.noreply.github.com> --- apps/website/src/pages/docs/_layout.astro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/website/src/pages/docs/_layout.astro b/apps/website/src/pages/docs/_layout.astro index 845e1d4c272..d8867293b6d 100644 --- a/apps/website/src/pages/docs/_layout.astro +++ b/apps/website/src/pages/docs/_layout.astro @@ -107,7 +107,7 @@ const currentPage = new URL(Astro.request.url).pathname; } :global(h2) { - border-top: 1px solid var(--color-line-2); + border-block-start: 1px solid var(--color-line-2); padding-block-start: var(--space-8); }