Merge pull request #5387 from github/repo-sync

repo sync

Author: Octomerger

includes/header.html

@@ -52,7 +52,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
             <div class="d-md-inline-block">
 
               <!-- Language picker - 'English', 'Japanese', etc -->
-              {% unless error == '404' or !page.hidden %}
+              {% if page.languageVariants.length > 0 and error != '404' and !page.hidden %}
                 <div class="border-top border-md-top-0 py-2 py-md-0 d-md-inline-block">
                   <details class="dropdown-withArrow position-relative details details-reset mr-md-3 close-when-clicked-outside">
                     <summary class="py-2 color-text-primary" role="button" aria-label="Toggle languages list">
@@ -84,7 +84,7 @@ <h4 class="text-mono f5 text-normal color-text-secondary d-md-none">{% data ui.h
                     </div>
                   </details>
                 </div>
-              {% endunless %}
+              {% endif %}
 
               <!-- GitHub.com homepage and 404 page has a stylized search; Enterprise homepages do not -->
               {% if page.relativePath != 'index.md' and error != '404' %}

layouts/enterprise-server-releases.html

@@ -9,7 +9,7 @@
       {% include header %}
       {% include deprecation-banner %}
 
-      <main class="container-xl px-3 px-md-6 my-4 my-lg-4 d-xl-flex">
+      <div class="container-xl px-3 px-md-6 my-4 my-lg-4 d-xl-flex">
         <article class="markdown-body width-full">
           <div class="d-lg-flex flex-justify-between"></div>
 
@@ -55,14 +55,13 @@ <h2 id="deprecated-on-developer.github.com"><a href="#deprecated-on-developer.gi
             {% for version in enterpriseServerReleases.deprecatedReleasesOnDeveloperSite %}
             <li><a href="https://developer.github.com/enterprise/{{version}}">Enterprise Server {{version}}</a></li>
             {% endfor %}
-            {% include support-section %}
-            {% include small-footer %}
-            {% include scroll-button %}
           </div>
           </div>
         </article>
-      </main>
-
+      </div>
+      {% include support-section %}
+      {% include small-footer %}
+      {% include scroll-button %}
     </main>
   </body>
 </html>

lib/get-mini-toc-items.js

@@ -1,11 +1,11 @@
 const cheerio = require('cheerio')
 const { range } = require('lodash')
 
-module.exports = function getMiniTocItems (html, maxHeadingLevel = 3) {
+module.exports = function getMiniTocItems (html, maxHeadingLevel = 3, headingScope = '') {
   const $ = cheerio.load(html, { xmlMode: true })
 
   // eg `h2, h3` or `h2, h3, h4` depending on maxHeadingLevel
-  const selector = range(2, maxHeadingLevel + 1).map(num => `h${num}`).join(', ')
+  const selector = range(2, maxHeadingLevel + 1).map(num => `${headingScope} h${num}`).join(', ')
   const headings = $(selector)
 
   // return an array of objects containing each heading's contents, level, and optional platform.

middleware/enterprise-server-releases.js

@@ -7,7 +7,7 @@ module.exports = async function enterpriseServerReleases (req, res, next) {
 
   const html = await liquid.parseAndRender(layouts['enterprise-server-releases'], req.context)
 
-  req.context.miniTocItems = getMiniTocItems(html)
+  req.context.miniTocItems = getMiniTocItems(html, 3, 'article')
 
   return res.send(await liquid.parseAndRender(layouts['enterprise-server-releases'], req.context))
 }