Merge pull request #2 from ttelang/main

Emily-Jiang · web-flow · commit 3718b7984d98 · 2025-06-17T22:18:53.000+01:00
Refining Fonts as per MicroProfile Branding Guidelines and updating favicon
diff --git 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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/partials/head-icons.hbs b/src/partials/head-icons.hbs
@@ -1 +1 @@
-    {{!-- <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon"> --}}
+    <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon">
diff --git a/src/static/favicon.ico b/src/static/favicon.ico

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,8 @@`
`3`	`3`	`flex: 1 1;`
`4`	`4`	`padding: 0 0.5rem 0 0.75rem;`
`5`	`5`	`line-height: var(--nav-line-height);`
	`6`	`+ font-family: var(--body-font-family);`
	`7`	`+ font-weight: normal;`
`6`	`8`	`}`
`7`	`9`
`8`	`10`	`@media screen and (min-width: 1024px) {`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ body {`
`37`	`37`	`font-size: calc(22 / var(--rem-base) * 1rem);`
`38`	`38`	`flex-wrap: wrap;`
`39`	`39`	`line-height: 1;`
	`40`	`+ font-family: var(--heading-font-family);`
	`41`	`+ font-weight: normal;`
`40`	`42`	`}`
`41`	`43`
`42`	`44`	`.navbar-brand .navbar-item:first-child a {`
Original file line number	Diff line number	Diff line change
`@@ -182,6 +182,8 @@ html.is-clipped--nav {`
`182`	`182`	`justify-content: space-between;`
`183`	`183`	`line-height: 1;`
`184`	`184`	`height: var(--drawer-height);`
	`185`	`+ font-family: var(--heading-font-family);`
	`186`	`+ font-weight: normal;`
`185`	`187`	`}`
`186`	`188`
`187`	`189`	`.nav-panel-explore:not(:first-child) .context {`
Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,8 @@`
`22`	`22`	`padding: 0.5rem 1.5rem 0.5rem 0.5rem;`
`23`	`23`	`position: relative;`
`24`	`24`	`z-index: var(--z-index-page-version-menu);`
	`25`	`+ font-family: var(--heading-font-family);`
	`26`	`+ font-weight: normal;`
`25`	`27`	`}`
`26`	`28`
`27`	`29`	`.page-versions .version-menu {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-@import 'typeface-open-sans.css';`
	`1`	`+@import 'typeface-lato.css';`
`2`	`2`	`@import 'typeface-roboto-mono.css';`
`3`	`3`	`@import 'vars.css';`
`4`	`4`	`@import 'base.css';`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`line-height: 1.3;`
`16`	`16`	`margin: 0 -1px;`
`17`	`17`	`padding-bottom: 0.25rem;`
	`18`	`+ font-family: var(--heading-font-family);`
`18`	`19`	`}`
`19`	`20`
`20`	`21`	`.toc.sidebar .toc-menu h3 {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`- {{!-- <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon"> --}}`
	`1`	`+ <link rel="icon" href="{{{uiRootPath}}}/img/favicon.ico" type="image/x-icon">`