Include header/footer components across layout types (github#18377)

* Flesh out our layouts to include header/footer components across layout types * Update contribution.html * Remove extra line that we don't need when we have the gray section
Z-byte-prog · Mar 25, 2021 · a017660 · a017660
1 parent ddad608
commit a017660
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 14 deletions.
diff --git a/includes/contribution.html b/includes/contribution.html
@@ -2,7 +2,12 @@
 <div class="f5 contribution">
   <h2 class="f4">{% data ui.contribution_cta.title %}</h2>
   <p class="text-gray f6">{% data ui.contribution_cta.body %}</p>
-  <a class="btn btn-outline" href={{ "https://github.com/github/docs/edit/main/content/" | append: page.relativePath }}>
+  {% if page.relativePath %}
+    {% assign contribution_href = "https://github.com/github/docs/edit/main/content/" | append: page.relativePath %}
+  {% else %}
+    {% assign contribution_href = "https://github.com/github/docs" %}
+  {% endif %}
+  <a class="btn btn-outline" href="{{ contribution_href }}">
     {% octicon "git-pull-request" height="16" %}
     {% data ui.contribution_cta.button %}
   </a>

diff --git a/layouts/enterprise-server-releases.html b/layouts/enterprise-server-releases.html
@@ -6,6 +6,9 @@
     {% include sidebar %}
 
     <main class="width-full">
+      {% include header %}
+      {% include deprecation-banner %}
+
       <main 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>
@@ -52,8 +55,9 @@ <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 %}
+            {% include support-section %}
             {% include small-footer %}
+            {% include scroll-button %}
           </div>
           </div>
         </article>

diff --git a/layouts/error-404.html b/layouts/error-404.html
@@ -1,3 +1,4 @@
+<!doctype html>
 {% assign error = '404' %}
 <html lang="{{currentLanguage}}">
   {% include head %}
@@ -31,8 +32,9 @@ <h3 class="mb-3">{% data ui.search.need_help %}</h3>
       </div>
 
       <!-- {{ content }} -->
-      {% include support %}
+      {% include support-section %}
       {% include small-footer %}
+      {% include scroll-button %}
     </main>
   </body>
 </html>
diff --git a/layouts/error-500.html b/layouts/error-500.html
@@ -1,3 +1,4 @@
+<!doctype html>
 <html lang="{{currentLanguage}}">
   {% include head %}
   <body>
@@ -21,7 +22,8 @@ <h1>{% data ui.errors.oops %}</h1>
     </div>
 
     <!-- {{ content }} -->
-    {% include support %}
+    {% include support-section %}
     {% include small-footer %}
+    {% include scroll-button %}
   </body>
 </html>
diff --git a/layouts/graphql-explorer.html b/layouts/graphql-explorer.html
@@ -7,6 +7,7 @@
 
     <main class="width-full">
       {% include header %}
+      {% include deprecation-banner %}
 
       <main class="container-xl px-3 px-md-6 my-4 my-lg-4 d-xl-flex">
         <article class="markdown-body width-full">
@@ -32,8 +33,9 @@ <h1 class="border-bottom-0">{{ page.title }}</h1>
         </article>
       </main>
 
-      {% include support %}
+      {% include support-section %}
       {% include small-footer %}
+      {% include scroll-button %}
     </main>
   </body>
 </html>
diff --git a/layouts/product-landing.html b/layouts/product-landing.html
@@ -7,6 +7,7 @@
 
     <main class="width-full">
       {% include header %}
+      {% include deprecation-banner %}
 
       <div class="container-xl px-3 px-md-6 pt-3 pb-2">
         <header class="d-lg-flex gutter-lg mb-6">
@@ -142,9 +143,9 @@ <h2 class="font-mktg h1 mb-2">Guides</h2>
         {% endif %}
       </div>
 
-      <div class="border-top">
-        {% include small-footer %}
-      </div>
+      {% include support-section %}
+      {% include small-footer %}
+      {% include scroll-button %}
     </main>
   </body>
 </html>
diff --git a/layouts/product-sublanding.html b/layouts/product-sublanding.html
@@ -9,6 +9,7 @@
 
     <main class="width-full overflow-auto">
       {% include header %}
+      {% include deprecation-banner %}
 
       <div class="bg-gray">
         <div class="container-xl px-3 px-md-6 pt-3 pb-2">
@@ -108,9 +109,9 @@ <h5 class="flex-auto pr-2">{{ guide.title }}</h5>
         </div>
       {% endif %}
 
-      <div class="border-top">
-        {% include small-footer %}
-      </div>
+      {% include support-section %}
+      {% include small-footer %}
+      {% include scroll-button %}
     </main>
   </body>
 </html>
diff --git a/layouts/release-notes.html b/layouts/release-notes.html
@@ -162,9 +162,9 @@ <h4 id="{{ slug }}" class="release-notes-section-heading text-uppercase text-bol
         </aside>
       </div>
 
-      <div class="border-top">
-        {% include small-footer %}
-      </div>
+      {% include support-section %}
+      {% include small-footer %}
+      {% include scroll-button %}
     </main>
   </body>
 </html>