From 239a3cf658ce86fb53994fe35bcd85ac3ab6fe50 Mon Sep 17 00:00:00 2001 From: Tarun Telang Date: Mon, 26 May 2025 17:40:16 +0000 Subject: [PATCH 1/3] feat: update editUrl for preview pages to point to the GitHub repository --- gulp.d/tasks/build-preview-pages.js | 4 ++++ preview-src/ui-model.yml | 2 +- src/static/favicon.ico | Bin 32988 -> 683 bytes 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/gulp.d/tasks/build-preview-pages.js b/gulp.d/tasks/build-preview-pages.js index fb36d1f..23cfdca 100644 --- a/gulp.d/tasks/build-preview-pages.js +++ b/gulp.d/tasks/build-preview-pages.js @@ -59,6 +59,10 @@ module.exports = (src, previewSrc, previewDest, sink = () => map()) => (done) => uiModel.page.layout = doc.getAttribute('page-layout', 'default') uiModel.page.title = doc.getDocumentTitle() uiModel.page.contents = Buffer.from(doc.convert()) + + // Set a meaningful editUrl for preview pages that points to the actual GitHub repo + const relativePath = path.relative(previewSrc, file.path) + uiModel.page.editUrl = `https://github.com/microprofile/microprofile-tutorial-ui/edit/main/preview-src/${relativePath}` } file.extname = '.html' try { diff --git a/preview-src/ui-model.yml b/preview-src/ui-model.yml index e684bce..34b433f 100644 --- a/preview-src/ui-model.yml +++ b/preview-src/ui-model.yml @@ -63,7 +63,7 @@ page: displayVersion: '5.2' module: ROOT relativeSrcPath: index.adoc - editUrl: http://example.com/project-xyz/blob/main/index.adoc + editUrl: https://github.com/microprofile/microprofile-tutorial-ui/edit/main/preview-src/index.adoc origin: private: false previous: diff --git a/src/static/favicon.ico b/src/static/favicon.ico index 1557db19eeb5f383bc0fe2c8f5b1608ba0518272..0559671e2a0dcc80370801510a3b2ee8eb7ad97a 100644 GIT binary patch literal 683 zcmV;c0#yBpP)%xKL7v%T}ebiR9Fe^mp^M1K^VrL9M>m07IumF0dn{OoV_lH5Cd8cm%|U> zeE~IvePU@L-mzcc?5t!5Y$XvSje=ewR*NUtpSjRIS`7otwF2>VX+YYk4oaI2fCB)#teOBgDs6tWOpvHW2vJlZ zM4JE(l{QNSNm)cDTd!$*Brv7TzlIu>He$sA$G--!U)p?HH&Mz*bfSGf0`Zg(6Iyf} z`%o>2(q=0G5mUytJ^C5%j$8X}Q~&vvD*-@Se7SL^1rtM4KMFPh?mlE^7--eID-TRLZ zpLvuB#QOhKHcx2Gcp0rQPUMeeD+^}U2DJLqThI!`*QNU9l>G0m|IG-P{sugY$jGmO R{_p?*002ovPDHLkV1k^*I2!-} literal 32988 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 Mq!36UaPkrOe{+kCvH$=8 From 2c502402e864a80743998a702945c352b5c1a279 Mon Sep 17 00:00:00 2001 From: Tarun Telang Date: Tue, 27 May 2025 15:35:49 +0000 Subject: [PATCH 2/3] feat: add Lato font and update CSS styles for various components --- src/css/breadcrumbs.css | 2 ++ src/css/header.css | 2 ++ src/css/nav.css | 2 ++ src/css/page-versions.css | 2 ++ src/css/site.css | 2 +- src/css/toc.css | 1 + src/css/typeface-lato.css | 35 +++++++++++++++++++++++++++++++++++ src/img/favicon.ico | Bin 0 -> 683 bytes src/partials/head-icons.hbs | 2 +- 9 files changed, 46 insertions(+), 2 deletions(-) create mode 100644 src/css/typeface-lato.css create mode 100644 src/img/favicon.ico diff --git a/src/css/breadcrumbs.css b/src/css/breadcrumbs.css index 3ccf6d4..557ee01 100644 --- a/src/css/breadcrumbs.css +++ b/src/css/breadcrumbs.css @@ -3,6 +3,8 @@ flex: 1 1; padding: 0 0.5rem 0 0.75rem; line-height: var(--nav-line-height); + font-family: var(--body-font-family); + font-weight: normal; } @media screen and (min-width: 1024px) { diff --git a/src/css/header.css b/src/css/header.css index f12bb32..321f3d0 100644 --- a/src/css/header.css +++ b/src/css/header.css @@ -37,6 +37,8 @@ body { font-size: calc(22 / var(--rem-base) * 1rem); flex-wrap: wrap; line-height: 1; + font-family: var(--heading-font-family); + font-weight: normal; } .navbar-brand .navbar-item:first-child a { diff --git a/src/css/nav.css b/src/css/nav.css index d29e948..c50bfde 100644 --- a/src/css/nav.css +++ b/src/css/nav.css @@ -182,6 +182,8 @@ html.is-clipped--nav { justify-content: space-between; line-height: 1; height: var(--drawer-height); + font-family: var(--heading-font-family); + font-weight: normal; } .nav-panel-explore:not(:first-child) .context { diff --git a/src/css/page-versions.css b/src/css/page-versions.css index 071df88..a8b6c63 100644 --- a/src/css/page-versions.css +++ b/src/css/page-versions.css @@ -22,6 +22,8 @@ padding: 0.5rem 1.5rem 0.5rem 0.5rem; position: relative; z-index: var(--z-index-page-version-menu); + font-family: var(--heading-font-family); + font-weight: normal; } .page-versions .version-menu { diff --git a/src/css/site.css b/src/css/site.css index 8d0f4ab..fe7d3ab 100644 --- a/src/css/site.css +++ b/src/css/site.css @@ -1,4 +1,4 @@ -@import 'typeface-open-sans.css'; +@import 'typeface-lato.css'; @import 'typeface-roboto-mono.css'; @import 'vars.css'; @import 'base.css'; diff --git a/src/css/toc.css b/src/css/toc.css index 0c6ef7e..da02b0f 100644 --- a/src/css/toc.css +++ b/src/css/toc.css @@ -15,6 +15,7 @@ line-height: 1.3; margin: 0 -1px; padding-bottom: 0.25rem; + font-family: var(--heading-font-family); } .toc.sidebar .toc-menu h3 { diff --git a/src/css/typeface-lato.css b/src/css/typeface-lato.css new file mode 100644 index 0000000..8757627 --- /dev/null +++ b/src/css/typeface-lato.css @@ -0,0 +1,35 @@ +/* lato-latin-400-normal */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-display: swap; + font-weight: 400; + src: url('https://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHjx4wXg.woff2') format('woff2'); +} + +/* lato-latin-700-normal */ +@font-face { + font-family: 'Lato'; + font-style: normal; + font-display: swap; + font-weight: 700; + src: url('https://fonts.gstatic.com/s/lato/v24/S6u9w4BMUTPHh6UVSwiPGQ.woff2') format('woff2'); +} + +/* lato-latin-400-italic */ +@font-face { + font-family: 'Lato'; + font-style: italic; + font-display: swap; + font-weight: 400; + src: url('https://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxsAXC-q.woff2') format('woff2'); +} + +/* lato-latin-700-italic */ +@font-face { + font-family: 'Lato'; + font-style: italic; + font-display: swap; + font-weight: 700; + src: url('https://fonts.gstatic.com/s/lato/v24/S6u_w4BMUTPHjxsI5wq_Gwft.woff2') format('woff2'); +} diff --git a/src/img/favicon.ico b/src/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..0559671e2a0dcc80370801510a3b2ee8eb7ad97a GIT binary patch literal 683 zcmV;c0#yBpP)%xKL7v%T}ebiR9Fe^mp^M1K^VrL9M>m07IumF0dn{OoV_lH5Cd8cm%|U> zeE~IvePU@L-mzcc?5t!5Y$XvSje=ewR*NUtpSjRIS`7otwF2>VX+YYk4oaI2fCB)#teOBgDs6tWOpvHW2vJlZ zM4JE(l{QNSNm)cDTd!$*Brv7TzlIu>He$sA$G--!U)p?HH&Mz*bfSGf0`Zg(6Iyf} z`%o>2(q=0G5mUytJ^C5%j$8X}Q~&vvD*-@Se7SL^1rtM4KMFPh?mlE^7--eID-TRLZ zpLvuB#QOhKHcx2Gcp0rQPUMeeD+^}U2DJLqThI!`*QNU9l>G0m|IG-P{sugY$jGmO R{_p?*002ovPDHLkV1k^*I2!-} literal 0 HcmV?d00001 diff --git a/src/partials/head-icons.hbs b/src/partials/head-icons.hbs index 4400e2f..eb06a4b 100644 --- a/src/partials/head-icons.hbs +++ b/src/partials/head-icons.hbs @@ -1 +1 @@ - {{!-- --}} + From e931e88b3aa3963d594949a4a48f59a1073fcb5f Mon Sep 17 00:00:00 2001 From: Tarun Telang Date: Sun, 8 Jun 2025 04:19:54 +0000 Subject: [PATCH 3/3] fix: remove unnecessary quotes around font-family in Lato CSS --- src/css/typeface-lato.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/css/typeface-lato.css b/src/css/typeface-lato.css index 8757627..60736d0 100644 --- a/src/css/typeface-lato.css +++ b/src/css/typeface-lato.css @@ -1,6 +1,6 @@ /* lato-latin-400-normal */ @font-face { - font-family: 'Lato'; + font-family: Lato; font-style: normal; font-display: swap; font-weight: 400; @@ -9,7 +9,7 @@ /* lato-latin-700-normal */ @font-face { - font-family: 'Lato'; + font-family: Lato; font-style: normal; font-display: swap; font-weight: 700; @@ -18,7 +18,7 @@ /* lato-latin-400-italic */ @font-face { - font-family: 'Lato'; + font-family: Lato; font-style: italic; font-display: swap; font-weight: 400; @@ -27,7 +27,7 @@ /* lato-latin-700-italic */ @font-face { - font-family: 'Lato'; + font-family: Lato; font-style: italic; font-display: swap; font-weight: 700;