From e8f6b14f9911ef9c2a50b6e20c830caf9d6458dc Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Mon, 21 Nov 2022 16:19:20 -0700 Subject: [PATCH 1/3] fix font paths - the font path changed when switching font packages - consistently quote all custom font families in value of font-family - restore max-height value for fold block in code - remove superfluous filter property (managed by autoprefixer) --- src/css/doc.css | 1 - src/css/spring/codetools.css | 2 +- src/css/spring/settings.css | 2 +- src/css/typeface-roboto-mono.css | 14 ++++++-------- src/css/typeface-roboto.css | 28 ++++++++++++---------------- src/css/vars.css | 4 ++-- 6 files changed, 22 insertions(+), 29 deletions(-) diff --git a/src/css/doc.css b/src/css/doc.css index d118b5dd..1b94d87f 100644 --- a/src/css/doc.css +++ b/src/css/doc.css @@ -818,5 +818,4 @@ h1.page + aside.toc.embedded { html.dark-theme .doc img { filter: invert(); - -webkit-filter: invert(100%); } diff --git a/src/css/spring/codetools.css b/src/css/spring/codetools.css index ba7d8c53..5221a30d 100644 --- a/src/css/spring/codetools.css +++ b/src/css/spring/codetools.css @@ -134,7 +134,7 @@ code:not(.unfolded) span.fold-block.hide-when-unfolded { code.unfolded span.fold-block.hide-when-unfolded, code:not(.unfolded) span.fold-block.hide-when-folded { - max-height: none; + max-height: 0; opacity: 0; } diff --git a/src/css/spring/settings.css b/src/css/spring/settings.css index aa59e0f4..a7987f8a 100644 --- a/src/css/spring/settings.css +++ b/src/css/spring/settings.css @@ -20,7 +20,7 @@ /* General */ --html-font-size: 1em; --pixel-to-rem: 16 * 1rem; - --font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; /* stylelint-disable-line */ + --font-family: -apple-system, blinkmacsystemfont, "Segoe UI", "Roboto", "Helvetica", "Arial", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; --font-weight: 400; --monospace-font-family: "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", monospace; --body-background-color: white; diff --git a/src/css/typeface-roboto-mono.css b/src/css/typeface-roboto-mono.css index c51a7fc8..841df088 100644 --- a/src/css/typeface-roboto-mono.css +++ b/src/css/typeface-roboto-mono.css @@ -3,10 +3,9 @@ font-style: normal; font-weight: 400; src: - local("Roboto Mono Regular"), - local("RobotoMono-Regular"), - url(~typeface-roboto-mono/files/roboto-mono-latin-400.woff2) format("woff2"), - url(~typeface-roboto-mono/files/roboto-mono-latin-400.woff) format("woff"); + url(~@fontsource/roboto-mono/files/roboto-mono-latin-400-normal.woff2) format("woff2"), + url(~@fontsource/roboto-mono/files/roboto-mono-latin-400-normal.woff) format("woff"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @font-face { @@ -14,8 +13,7 @@ font-style: normal; font-weight: 500; src: - local("Roboto Mono Medium"), - local("RobotoMono-Medium"), - url(~typeface-roboto-mono/files/roboto-mono-latin-500.woff2) format("woff2"), - url(~typeface-roboto-mono/files/roboto-mono-latin-500.woff) format("woff"); + url(~@fontsource/roboto-mono/files/roboto-mono-latin-500-normal.woff2) format("woff2"), + url(~@fontsource/roboto-mono/files/roboto-mono-latin-500-normal.woff) format("woff"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/src/css/typeface-roboto.css b/src/css/typeface-roboto.css index 78254868..1648a2bd 100644 --- a/src/css/typeface-roboto.css +++ b/src/css/typeface-roboto.css @@ -3,10 +3,9 @@ font-style: normal; font-weight: 400; src: - local("Roboto Regular"), - local("Roboto-Regular"), - url(~typeface-roboto/files/roboto-latin-400.woff2) format("woff2"), - url(~typeface-roboto/files/roboto-latin-400.woff) format("woff"); + url(~@fontsource/roboto/files/roboto-latin-400-normal.woff2) format("woff2"), + url(~@fontsource/roboto/files/roboto-latin-400-normal.woff) format("woff"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @font-face { @@ -14,10 +13,9 @@ font-style: italic; font-weight: 400; src: - local("Roboto Italic"), - local("Roboto-Italic"), - url(~typeface-roboto/files/roboto-latin-400italic.woff2) format("woff2"), - url(~typeface-roboto/files/roboto-latin-400italic.woff) format("woff"); + url(~@fontsource/roboto/files/roboto-latin-400-italic.woff2) format("woff2"), + url(~@fontsource/roboto/files/roboto-latin-400-italic.woff) format("woff"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @font-face { @@ -25,10 +23,9 @@ font-style: normal; font-weight: 500; src: - local("Roboto Medium"), - local("Roboto-Medium"), - url(~typeface-roboto/files/roboto-latin-500.woff2) format("woff2"), - url(~typeface-roboto/files/roboto-latin-500.woff) format("woff"); + url(~@fontsource/roboto/files/roboto-latin-500-normal.woff2) format("woff2"), + url(~@fontsource/roboto/files/roboto-latin-500-normal.woff) format("woff"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } @font-face { @@ -36,8 +33,7 @@ font-style: italic; font-weight: 500; src: - local("Roboto Medium Italic"), - local("Roboto-MediumItalic"), - url(~typeface-roboto/files/roboto-latin-500italic.woff2) format("woff2"), - url(~typeface-roboto/files/roboto-latin-500italic.woff) format("woff"); + url(~@fontsource/roboto/files/roboto-latin-500-italic.woff2) format("woff2"), + url(~@fontsource/roboto/files/roboto-latin-500-italic.woff) format("woff"); + unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA, U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212, U+2215, U+FEFF, U+FFFD; } diff --git a/src/css/vars.css b/src/css/vars.css index 3b25cc0a..f3769889 100644 --- a/src/css/vars.css +++ b/src/css/vars.css @@ -19,7 +19,7 @@ /* General */ --html-font-size: 1em; --pixel-to-rem: 16 * 1rem; - --font-family: -apple-system, blinkmacsystemfont, "Segoe UI", roboto, helvetica, arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + --font-family: -apple-system, blinkmacsystemfont, "Segoe UI", "Roboto", "Helvetica", "Arial", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; --font-weight: 400; --monospace-font-family: "SFMono-Regular", "Consolas", "Liberation Mono", "Menlo", monospace; --body-background-color: white; @@ -41,7 +41,7 @@ --body-font-size--print: 0.9375em; /* 15px */ --body-line-height: 1.15; --body-font-color: #191e1e; - --body-font-family: "roboto", sans-serif; + --body-font-family: "Roboto", sans-serif; --body-font-weight-bold: 500; --monospace-font-weight-bold: 500; /* base */ From 3a4f2bc09d87ca49122c4d916a5f8bb55b8d563c Mon Sep 17 00:00:00 2001 From: Dan Allen Date: Fri, 18 Nov 2022 18:32:09 -0700 Subject: [PATCH 2/3] use toc data-title attribute properly --- preview-src/index.adoc | 2 +- src/js/02-on-this-page.js | 3 +-- src/partials/toc.hbs | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/preview-src/index.adoc b/preview-src/index.adoc index 4638bbf2..f203a685 100644 --- a/preview-src/index.adoc +++ b/preview-src/index.adoc @@ -1,4 +1,4 @@ -= Hardware and Software Requirements += Hardware & Software Requirements Author Name :idprefix: :idseparator: - diff --git a/src/js/02-on-this-page.js b/src/js/02-on-this-page.js index d0807ebf..035bea45 100644 --- a/src/js/02-on-this-page.js +++ b/src/js/02-on-this-page.js @@ -37,11 +37,10 @@ }, document.createElement('ul')) var menu = sidebar.querySelector('.toc-menu') - var titlePage = document.getElementById('page-title') if (!menu) (menu = document.createElement('div')).className = 'toc-menu' var title = document.createElement('h3') - title.textContent = titlePage.textContent || 'Contents' + title.textContent = sidebar.dataset.title || 'Contents' menu.appendChild(title) menu.appendChild(list) diff --git a/src/partials/toc.hbs b/src/partials/toc.hbs index 2b291908..cf37bb88 100644 --- a/src/partials/toc.hbs +++ b/src/partials/toc.hbs @@ -1,3 +1,3 @@ -