Branch was updated using the 'autoupdate branch' Actions workflow.

Author: Octomerger

assets/images/octicons/hamburger.svg

@@ -3,7 +3,7 @@
     <summary class="f4 h5-mktg btn-outline-mktg btn-mktg p-2">
       <!-- GitHub.com, Enterprise Server 2.16, etc -->
       <span class="d-md-none d-xl-inline-block">{% data ui.pages.article_version %}</span> {{ allVersions[currentVersion].versionTitle }}
-      <svg class="arrow ml-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="#1277eb"><path d="M1,1l6.2,6L13,1"></path></svg>
+      <svg class="arrow ml-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="currentColor"><path d="M1,1l6.2,6L13,1"></path></svg>
     </summary>
 
     <div class="nav-dropdown position-absolute color-bg-primary rounded-1 px-4 py-3 top-7 color-shadow-large" style="z-index: 6; width: 210px;">

assets/images/octicons/search.svg

@@ -45,7 +45,7 @@
 {% endif %}
 
 {% if release_notification_type %}
-  <div class="header-notifications text-center f5 color-bg-info-inverse color-text-primary py-4 px-6 release_notice{% if early_access_notification_type %} border-bottom color-border-tertiary{% endif %}">
+  <div class="header-notifications text-center f5 color-bg-info color-text-primary py-4 px-6 release_notice{% if early_access_notification_type %} border-bottom color-border-tertiary{% endif %}">
     {{ release_notification }}
   </div>
 {% endif %}

assets/images/octicons/x.svg

@@ -27,7 +27,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
                     <!-- Product switcher - GitHub.com, Enterprise Server, etc -->
                     <!-- 404 and 500 error layouts are not real pages so we need to hardcode the name for those -->
                     {{ productMap[currentProduct].name }}
-                    <svg class="arrow ml-md-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="#1277eb"><path d="M1,1l6.2,6L13,1"></path></svg>
+                    <svg class="arrow ml-md-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="currentColor"><path d="M1,1l6.2,6L13,1"></path></svg>
                   </div>
                 </summary>
                 <!-- Mobile-only product dropdown -->
@@ -38,7 +38,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
                       {% if product.id == currentProduct %}color-text-link-mktg text-underline active{% elsif product.id == currentProduct.id %}color-text-link-mktg text-underline active{% else %}Link--primary no-underline{% endif %}">
                       {{ product.name }}
                       {% if product.external %}
-                      <span class="ml-1"><svg width="9" height="10" viewBox="0 0 9 10" fill="none" xmlns="http://www.w3.org/2000/svg"><path stroke="#24292e" d="M.646 8.789l8-8M8.5 9V1M1 .643h8"/></svg></span>
+                      <span class="ml-1"><svg width="9" height="10" viewBox="0 0 9 10" fill="none" xmlns="http://www.w3.org/2000/svg"><path stroke="currentColor" d="M.646 8.789l8-8M8.5 9V1M1 .643h8"/></svg></span>
                       {% endif %}
                   </a>
                   {% endfor %}
@@ -62,7 +62,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
                         {% else %}
                           {{ languages[page.languageCode].name }}
                         {% endif %}
-                        <svg class="arrow ml-md-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="#1B1F23"><path d="M1,1l6.2,6L13,1"></path></svg>
+                        <svg class="arrow ml-md-1" width="14px" height="8px" viewBox="0 0 14 8" xml:space="preserve" fill="none" stroke="currentColor"><path d="M1,1l6.2,6L13,1"></path></svg>
                       </div>
                     </summary>
                     <div id="languages-selector" class="position-md-absolute nav-desktop-langDropdown p-md-4 right-md-n4 top-md-6" style="z-index: 6;">

includes/article-version-switcher.html

@@ -0,0 +1,25 @@
+const layouts = require('../../lib/layouts')
+
+module.exports = function layoutContext (req, res, next) {
+  if (!req.context.page) return next()
+
+  let layoutName
+
+  if (req.context.page.layout) {
+    // Layouts can be specified with a `layout` frontmatter value.
+    // Any invalid layout values will be caught by frontmatter schema validation.
+    layoutName = req.context.page.layout
+    // A `layout: false` value means use no layout.
+  } else if (req.context.page.layout === false) {
+    layoutName = ''
+    // If undefined, use either the default layout or the generic-toc layout.
+  } else if (req.context.page.layout === undefined) {
+    layoutName = 'default'
+  }
+
+  // Attach to the context object
+  req.context.currentLayoutName = layoutName
+  req.context.currentLayout = layouts[layoutName]
+
+  return next()
+}

includes/footer.html

@@ -110,6 +110,7 @@ module.exports = function (app) {
   app.use(instrument('./contextualizers/rest'))
   app.use(instrument('./contextualizers/webhooks'))
   app.use(asyncMiddleware(instrument('./contextualizers/whats-new-changelog')))
+  app.use(instrument('./contextualizers/layout'))
   app.use(asyncMiddleware(instrument('./breadcrumbs')))
   app.use(asyncMiddleware(instrument('./early-access-breadcrumbs')))
   app.use(asyncMiddleware(instrument('./enterprise-server-releases')))

includes/header-notification.html

@@ -136,15 +136,8 @@ module.exports = async function renderPage (req, res, next) {
     }
   }
 
-  // Layouts can be specified with a `layout` frontmatter value
-  // If unspecified, `layouts/default.html` is used.
-  // Any invalid layout values will be caught by frontmatter schema validation.
-  const layoutName = context.page.layout || 'default'
-
-  // Set `layout: false` to use no layout
-  const layout = context.page.layout === false ? '' : layouts[layoutName]
-
-  const output = await liquid.parseAndRender(layout, context)
+  // currentLayout is added to the context object in middleware/contextualizers/layouts
+  const output = await liquid.parseAndRender(req.context.currentLayout, context)
 
   // First, send the response so the user isn't waiting
   // NOTE: Do NOT `return` here as we still need to cache the response afterward!