Merge branch 'main' into update-webpack-dep

mikesurowiec · web-flow · commit ac84e362b0ba · 2021-04-14T10:30:59.000-07:00
diff --git a/assets/images/octicons/hamburger.svg b/assets/images/octicons/hamburger.svg
@@ -1 +1 @@
-<svg width="18" height="24" viewBox="0 0 18 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M17.115 13.5H.885C0 13.5 0 12.885 0 12s0-1.5.885-1.5H17.1c.885 0 .885.615.885 1.5s0 1.5-.885 1.5h.015zm0-6H.885C0 7.5 0 6.885 0 6s0-1.5.885-1.5H17.1c.885 0 .885.615.885 1.5s0 1.5-.885 1.5h.015zm-16.23 9H17.1c.885 0 .885.615.885 1.5s0 1.5-.885 1.5H.885C0 19.5 0 18.885 0 18s0-1.5.885-1.5z" fill="#1B1F23"/></svg>
+<svg width="18" height="24" viewBox="0 0 18 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M17.115 13.5H.885C0 13.5 0 12.885 0 12s0-1.5.885-1.5H17.1c.885 0 .885.615.885 1.5s0 1.5-.885 1.5h.015zm0-6H.885C0 7.5 0 6.885 0 6s0-1.5.885-1.5H17.1c.885 0 .885.615.885 1.5s0 1.5-.885 1.5h.015zm-16.23 9H17.1c.885 0 .885.615.885 1.5s0 1.5-.885 1.5H.885C0 19.5 0 18.885 0 18s0-1.5.885-1.5z" fill="#6a737d"/></svg>
diff --git a/assets/images/octicons/search.svg b/assets/images/octicons/search.svg
@@ -1 +1 @@
-<svg fill="none" height="16" viewBox="0 0 17 16" width="17" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m16.5089 13.3-3.7792-3.83c.6943-.98 1.101-2.17 1.101-3.47 0-3.31-2.6683-6-5.9516-6s-5.95161 2.69-5.95161 6 2.66831 6 5.95161 6c1.28952 0 2.46-.41 3.442-1.11l3.7991 3.81c.1885.2.4464.3.6944.3s.5158-.09.6943-.3c.3869-.39.3869-1.02 0-1.41zm-8.6298-2.6c-2.56911 0-4.66209-2.11-4.66209-4.7s2.09298-4.7 4.66209-4.7c2.5691 0 4.6621 2.11 4.6621 4.7s-2.093 4.7-4.6621 4.7z" fill="#1074e7" fill-rule="evenodd"/></svg>
+<svg fill="none" height="16" viewBox="0 0 17 16" width="17" xmlns="http://www.w3.org/2000/svg"><path clip-rule="evenodd" d="m16.5089 13.3-3.7792-3.83c.6943-.98 1.101-2.17 1.101-3.47 0-3.31-2.6683-6-5.9516-6s-5.95161 2.69-5.95161 6 2.66831 6 5.95161 6c1.28952 0 2.46-.41 3.442-1.11l3.7991 3.81c.1885.2.4464.3.6944.3s.5158-.09.6943-.3c.3869-.39.3869-1.02 0-1.41zm-8.6298-2.6c-2.56911 0-4.66209-2.11-4.66209-4.7s2.09298-4.7 4.66209-4.7c2.5691 0 4.6621 2.11 4.6621 4.7s-2.093 4.7-4.6621 4.7z" fill="#6a737d" fill-rule="evenodd"/></svg>
diff --git a/assets/images/octicons/x.svg b/assets/images/octicons/x.svg
@@ -1 +1 @@
-<svg width="16" height="22" viewBox="0 0 16 22" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.974 10.667l5 5L13 17.64l-5-5-5 5-1.973-1.973 5-5-5-5L3 3.693l5 5 5-5 1.973 1.974-5 5z" fill="#1B1F23"/></svg>
+<svg width="16" height="22" viewBox="0 0 16 22" fill="none" xmlns="http://www.w3.org/2000/svg"><path fill-rule="evenodd" clip-rule="evenodd" d="M9.974 10.667l5 5L13 17.64l-5-5-5 5-1.973-1.973 5-5-5-5L3 3.693l5 5 5-5 1.973 1.974-5 5z" fill="#6a737d"/></svg>
diff --git a/content/github/administering-a-repository/renaming-a-branch.md b/content/github/administering-a-repository/renaming-a-branch.md
@@ -38,4 +38,10 @@ From the local clone of the repository on a computer, run the following commands
 $ git branch -m <em>OLD-BRANCH-NAME</em> <em>NEW-BRANCH-NAME</em>
 $ git fetch origin
 $ git branch -u origin/<em>NEW-BRANCH-NAME</em> <em>NEW-BRANCH-NAME</em>
+$ git remote set-head origin -a
+```
+
+Optionally, run the following command to remove tracking references to the old branch name.
+```
+$ git remote prune origin
 ```
diff --git a/includes/article-version-switcher.html b/includes/article-version-switcher.html
@@ -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;">
diff --git a/includes/footer.html b/includes/footer.html
diff --git a/includes/header-notification.html b/includes/header-notification.html
@@ -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 %}
diff --git a/includes/header.html b/includes/header.html
@@ -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;">
diff --git a/lib/graphql/static/prerendered-input-objects.json b/lib/graphql/static/prerendered-input-objects.json
diff --git a/lib/graphql/static/prerendered-objects.json b/lib/graphql/static/prerendered-objects.json
diff --git a/middleware/contextualizers/layout.js b/middleware/contextualizers/layout.js
@@ -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()
+}
diff --git a/middleware/index.js b/middleware/index.js
@@ -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')))
diff --git a/middleware/render-page.js b/middleware/render-page.js
@@ -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!
diff --git a/script/release-heroku b/script/release-heroku
@@ -24,8 +24,8 @@ if [[ "$EXIT_STATUS" -ne "0" ]]; then
     echo "Exiting..."
     exit 0
   fi
+else
+  # Execute the release script and exit with its status
+  node script/purge-redis-pages.js
+  exit $?
 fi
-
-# Execute the release script and exit with its status
-node script/purge-redis-pages.js
-exit $?
diff --git a/stylesheets/gradient.scss b/stylesheets/gradient.scss
@@ -1,6 +1,6 @@
 $gradients: (
-  "-purple-pink": linear-gradient(135deg, var(--color-auto-purple-4) 0%, var(--color-auto-pink-5) 100%),
-  "-aquamarine-mauve":  linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%),
+  "-purple-pink": linear-gradient(135deg, var(--color-auto-purple-5) 0%, var(--color-auto-pink-5) 100%),
+/*"-aquamarine-mauve":  linear-gradient(130deg, #3bf0e4 -6.8%, #bca1f7 70%),
   "-purple-coral":  linear-gradient(87.54deg, #9867f0 -6.8%, #ed4e50 84.14%),
   "-purple-coral-dark": linear-gradient(92deg, #bca1f7 15%, #e577b4 45%, #ff7170 85%),
   "-coral-yellow":  linear-gradient(267.91deg, #ffe57f 9.35%, #ff7170 96.48%),
@@ -11,10 +11,10 @@ $gradients: (
   "-turq-purple-dark": linear-gradient(-70deg, #3bf0e4 0%, #bca1f7 100%),
   "-blue-green": linear-gradient(-70deg, #2188ff 0%, #01a49e 100%),
   "-red-orange": linear-gradient(-70deg, #ed4e50 0%, #f06f00 100%),
-  "-blue-purple": linear-gradient(-70deg, #2188ff 0%, #804eda 100%),
-  "-pink-blue": linear-gradient(90deg, #D047A5 -50%, #0C69F9 150%),
-  "-pink-blue-dark": linear-gradient(-70deg, #e577b4 0%, #64acff 100%),
-  "-blue-pink": linear-gradient(-70deg, #0C69F9 0%, #D047A5 100%)
+  "-blue-purple": linear-gradient(-70deg, #2188ff 0%, #804eda 100%), */
+  "-pink-blue": linear-gradient(90deg, var(--color-auto-pink-5) -50%, var(--color-auto-blue-5) 150%),
+  "-pink-blue-dark": linear-gradient(-70deg, var(--color-auto-pink-3) 0%, var(--color-auto-blue-3) 100%),
+  "-blue-pink": linear-gradient(-70deg, var(--color-auto-blue-5) 0%, var(--color-auto-pink-5) 100%)
 ) !default;
 
 @mixin bg-gradient($parent, $gradient) {
@@ -41,7 +41,7 @@ $border-width: 2px;
     &:before {
       content: "";
       position: absolute;
-      background: white;
+      background: var(--color-bg-primary);
       border-radius: inherit;
       z-index: 1;
       left: 0;
