Merge pull request #2 from ttelang/main

Refining Fonts as per MicroProfile Branding Guidelines and updating favicon

Author: Emily-Jiang

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 {

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:

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) {

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 {

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 {

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 {

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';

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 {

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');
+}