From 5707ec1de901c200a91ce561e17484f4aa11064a Mon Sep 17 00:00:00 2001 From: Cole Goldsmith Date: Mon, 13 Nov 2023 16:25:25 -0600 Subject: [PATCH 1/3] add upshifted heading styles --- src/css/doc.css | 16 +++++++++++----- src/css/highlight.css | 2 +- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/css/doc.css b/src/css/doc.css index 9ec7e290..d44f2624 100644 --- a/src/css/doc.css +++ b/src/css/doc.css @@ -54,23 +54,23 @@ } .doc h1 { - @include text-h1; + @include text-display; } .doc h2 { - @include text-h2; + @include text-h1; } .doc h3 { - @include text-h3; + @include text-h2; } .doc h4 { - @include text-h4; + @include text-h3; } .doc h5 { - @include text-h5; + @include text-h4; } .doc a.link, @@ -265,6 +265,12 @@ text-decoration: line-through; } +.doc strong, +.doc b { + font-weight: var(--body-font-weight-bold); + color: var(--ds-text-primary); +} + .doc .paragraph, .doc .dlist, .doc .hdlist, diff --git a/src/css/highlight.css b/src/css/highlight.css index bded247b..8d444273 100644 --- a/src/css/highlight.css +++ b/src/css/highlight.css @@ -111,7 +111,7 @@ } .hljs-strong { - font-weight: bold; + font-weight: 500; } .hljs { From a1ecdfad0150366ca4c7ca9ec5c694ab6c452320 Mon Sep 17 00:00:00 2001 From: Cole Goldsmith Date: Mon, 13 Nov 2023 17:34:33 -0600 Subject: [PATCH 2/3] remove sora on h2, add margin on data lists --- src/css/doc.css | 4 ++++ src/css/ds-typography.css | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/css/doc.css b/src/css/doc.css index d44f2624..a3f50af9 100644 --- a/src/css/doc.css +++ b/src/css/doc.css @@ -895,6 +895,10 @@ vertical-align: top; } +.doc dd + dt.hdlist1 { + margin-top: calc(24 / var(--rem-base) * 1rem); +} + .doc tr:first-child > .hdlist1, .doc tr:first-child > .hdlist2 { padding-top: 0; diff --git a/src/css/ds-typography.css b/src/css/ds-typography.css index a228457a..1218b0ca 100644 --- a/src/css/ds-typography.css +++ b/src/css/ds-typography.css @@ -13,7 +13,6 @@ @mixin text-h2 { font-size: calc(20 / var(--rem-base) * 1rem); font-weight: 550; - font-family: "Sora", sans-serif; } @mixin text-h3 { From 1265e5949151da1012f6768d1f8097da0f1b22a0 Mon Sep 17 00:00:00 2001 From: Cole Goldsmith Date: Mon, 13 Nov 2023 18:16:55 -0600 Subject: [PATCH 3/3] revert heading upshift --- src/css/doc.css | 10 +++++----- src/css/ds-typography.css | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/css/doc.css b/src/css/doc.css index a3f50af9..10976905 100644 --- a/src/css/doc.css +++ b/src/css/doc.css @@ -54,23 +54,23 @@ } .doc h1 { - @include text-display; + @include text-h1; } .doc h2 { - @include text-h1; + @include text-h2; } .doc h3 { - @include text-h2; + @include text-h3; } .doc h4 { - @include text-h3; + @include text-h4; } .doc h5 { - @include text-h4; + @include text-h5; } .doc a.link, diff --git a/src/css/ds-typography.css b/src/css/ds-typography.css index 1218b0ca..a228457a 100644 --- a/src/css/ds-typography.css +++ b/src/css/ds-typography.css @@ -13,6 +13,7 @@ @mixin text-h2 { font-size: calc(20 / var(--rem-base) * 1rem); font-weight: 550; + font-family: "Sora", sans-serif; } @mixin text-h3 {