dotnet · yufeih · Oct 28, 2023 · Oct 28, 2023 · Oct 28, 2023 · Oct 28, 2023
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -32,7 +32,8 @@
       "_appTitle": "docfx",
       "_appName": "docfx",
       "_appFooter": "<span>Supported by the <a href=\"https://dotnetfoundation.org\">.NET Foundation</a>. Made with <a href=\"https://dotnet.github.io/docfx\">docfx</a></span>",
-      "_googleAnalyticsTagId": "G-Q5N6XJHEX5"
+      "_googleAnalyticsTagId": "G-Q5N6XJHEX5",
+      "pdf": true
     },
     "markdownEngineProperties": {
       "alerts": {

diff --git a/templates/default(zh-cn)/token.json b/templates/default(zh-cn)/token.json
@@ -58,5 +58,6 @@
   "themeDark": "夜晚",
   "themeAuto": "自动",
   "changeTheme": "切换主题",
-  "copy": "复制"
+  "copy": "复制",
+  "downloadPdf": "下载 PDF"
 }
diff --git a/templates/default/token.json b/templates/default/token.json
@@ -68,5 +68,6 @@
   "themeDark": "Dark",
   "themeAuto": "Auto",
   "changeTheme": "Change theme",
-  "copy": "Copy"
+  "copy": "Copy",
+  "downloadPdf": "Download PDF"
 }
diff --git a/templates/modern/layout/_master.tmpl b/templates/modern/layout/_master.tmpl
@@ -35,6 +35,7 @@
       <meta name="loc:themeAuto" content="{{__global.themeAuto}}">
       <meta name="loc:changeTheme" content="{{__global.changeTheme}}">
       <meta name="loc:copy" content="{{__global.copy}}">
+      <meta name="loc:downloadPdf" content="{{__global.downloadPdf}}">
     {{/redirect_url}}
   </head>
 
@@ -135,7 +136,7 @@
     <div class="container-xxl search-results" id="search-results"></div>
     {{/_enableSearch}}
 
-    <footer class="border-top">
+    <footer class="border-top text-secondary">
       <div class="container-xxl">
         <div class="flex-fill">
           {{{_appFooter}}}{{^_appFooter}}<span>Made with <a href="https://dotnet.github.io/docfx">docfx</a></span>{{/_appFooter}}

diff --git a/templates/modern/src/layout.scss b/templates/modern/src/layout.scss
@@ -6,7 +6,7 @@
 $header-height: 60px;
 $footer-height: 60px;
 $main-padding-top: 1.6rem;
-$main-padding-bottom: 4rem;
+$main-padding-bottom: 2rem;
 
 // Makes a div sticky to top
 @mixin sticky-top {
@@ -53,6 +53,7 @@ body[data-layout="landing"] {
   }
 
   >footer {
+    font-size: 14px;
     padding: 1rem 0;
     height: $footer-height;
 
@@ -121,8 +122,7 @@ body[data-layout="landing"] {
         >.toc-offcanvas {
           flex: .35;
           display: block;
-          overflow-x: hidden;
-          overflow-y: auto;
+          overflow: hidden;
           max-width: 360px;
           max-height: calc(100vh - $header-height - $main-padding-top);
 
@@ -131,9 +131,15 @@ body[data-layout="landing"] {
           @include media-breakpoint-down(md) {
             flex: 0;
           }
+
+          .offcanvas-start, .offcanvas-body {
+            height: 100%;
+          }
         }
 
         >.content {
+          display: flex;
+          flex-direction: column;
           flex: 1;
           min-width: 0;
           margin: 0 3rem;
@@ -146,6 +152,10 @@ body[data-layout="landing"] {
             min-height: 40px;
           }
 
+          article {
+            flex: 1;
+          }
+
           >.contribution,
           >.next-article {
             display: flex;

diff --git a/templates/modern/src/toc.scss b/templates/modern/src/toc.scss
@@ -8,6 +8,9 @@ $expand-stub-width: .85rem;
 .toc {
   min-width: 0;
   width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
 
   ul {
     font-size: 14px;
@@ -72,7 +75,7 @@ $expand-stub-width: .85rem;
     display: flex;
     position: relative;
     align-items: center;
-    margin-bottom: 1rem;
+    margin-bottom: .5rem;
 
     >i.bi {
       position: absolute;
@@ -89,4 +92,15 @@ $expand-stub-width: .85rem;
     font-size: .9em;
     color: $secondary;
   }
+
+  a.pdf-link {
+    @include underline-on-hover;
+
+    &::before {
+      content: "\F756";
+      display: inline-block;
+
+      @include adjust-icon;
+    }
+  }
 }
diff --git a/templates/modern/src/toc.ts b/templates/modern/src/toc.ts
@@ -24,7 +24,7 @@ export async function renderToc(): Promise<TocNode[]> {
   const disableTocFilter = meta('docfx:disabletocfilter') === 'true'
 
   const tocUrl = new URL(tocrel.replace(/.html$/gi, '.json'), window.location.href)
-  const { items } = await (await fetch(tocUrl)).json()
+  const { items, pdf, pdfFileName } = await (await fetch(tocUrl)).json()
 
   const tocFilterUrl = disableTocFilter ? '' : (localStorage?.getItem('tocFilterUrl') || '')
   let tocFilter = disableTocFilter ? '' : (localStorage?.getItem('tocFilter') || '')
@@ -92,7 +92,10 @@ export async function renderToc(): Promise<TocNode[]> {
   }
 
   function renderToc() {
-    render(html`${renderTocFilter()} ${renderTocNodes(items) || renderNoFilterResult()}`, tocContainer)
+    render(html`
+      ${renderTocFilter()} 
+      <div class="flex-fill overflow-y-auto">${renderTocNodes(items) || renderNoFilterResult()}</div>
+      ${renderDownloadPdf()}`, tocContainer)
   }
 
   function renderTocNodes(nodes: TocNode[]): TemplateResult {
@@ -150,6 +153,10 @@ export async function renderToc(): Promise<TocNode[]> {
     return tocFilter === '' ? null : html`<div class='no-result'>${loc('searchNoResults', { query: tocFilter })}</div>`
   }
 
+  function renderDownloadPdf(): TemplateResult {
+    return pdf ? html`<div class="py-2 mb-md-4"><a class="pdf-link" href="${pdfFileName || 'toc.pdf'}">${loc('downloadPdf')}</a></div>` : null
+  }
+
   function normalizeUrlPath(url: { pathname: string }): string {
     return url.pathname.replace(/\/index\.html$/gi, '/')
   }

diff --git a/...Tests/SamplesTest.CSharp/api/CSharp10.ConstantInterpolatedStrings.html.view.verified.json b/...Tests/SamplesTest.CSharp/api/CSharp10.ConstantInterpolatedStrings.html.view.verified.json
@@ -1079,6 +1079,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.Issue7737.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.Issue7737.html.view.verified.json
@@ -809,6 +809,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...s/SamplesTest.CSharp/api/CSharp10.ParameterlessStructConstructors.html.view.verified.json b/...s/SamplesTest.CSharp/api/CSharp10.ParameterlessStructConstructors.html.view.verified.json
@@ -1214,6 +1214,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...apshot.Tests/SamplesTest.CSharp/api/CSharp10.ReadOnlyRecordStruct.html.view.verified.json b/...apshot.Tests/SamplesTest.CSharp/api/CSharp10.ReadOnlyRecordStruct.html.view.verified.json
@@ -1438,6 +1438,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/.../docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.RecordClass.html.view.verified.json b/.../docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.RecordClass.html.view.verified.json
@@ -1314,6 +1314,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.RecordStruct.html.view.verified.json b/...docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.RecordStruct.html.view.verified.json
@@ -1213,6 +1213,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp10.html.view.verified.json
@@ -536,6 +536,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...sts/SamplesTest.CSharp/api/CSharp11.CheckedUserDefinedOperators-1.html.view.verified.json b/...sts/SamplesTest.CSharp/api/CSharp11.CheckedUserDefinedOperators-1.html.view.verified.json
@@ -4227,6 +4227,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...x.Snapshot.Tests/SamplesTest.CSharp/api/CSharp11.RequiredModifier.html.view.verified.json b/...x.Snapshot.Tests/SamplesTest.CSharp/api/CSharp11.RequiredModifier.html.view.verified.json
@@ -1214,6 +1214,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...cfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp11.ScopedModifier.html.view.verified.json b/...cfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp11.ScopedModifier.html.view.verified.json
@@ -903,6 +903,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/....CSharp/api/CSharp11.StaticAbstractMembersInInterfaces.IGetNext-1.html.view.verified.json b/....CSharp/api/CSharp11.StaticAbstractMembersInInterfaces.IGetNext-1.html.view.verified.json
@@ -508,6 +508,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...arp/api/CSharp11.StaticAbstractMembersInInterfaces.RepeatSequence.html.view.verified.json b/...arp/api/CSharp11.StaticAbstractMembersInInterfaces.RepeatSequence.html.view.verified.json
@@ -1347,6 +1347,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...SamplesTest.CSharp/api/CSharp11.StaticAbstractMembersInInterfaces.html.view.verified.json b/...SamplesTest.CSharp/api/CSharp11.StaticAbstractMembersInInterfaces.html.view.verified.json
@@ -669,6 +669,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp11.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp11.html.view.verified.json
@@ -544,6 +544,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...pshot.Tests/SamplesTest.CSharp/api/CSharp12.CollectionExpressions.html.view.verified.json b/...pshot.Tests/SamplesTest.CSharp/api/CSharp12.CollectionExpressions.html.view.verified.json
@@ -1132,6 +1132,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...hot.Tests/SamplesTest.CSharp/api/CSharp12.DefaultLambdaParameters.html.view.verified.json b/...hot.Tests/SamplesTest.CSharp/api/CSharp12.DefaultLambdaParameters.html.view.verified.json
@@ -809,6 +809,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp12.InlineArrays.html.view.verified.json b/...docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp12.InlineArrays.html.view.verified.json
@@ -568,6 +568,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...s/SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.BankAccount.html.view.verified.json b/...s/SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.BankAccount.html.view.verified.json
@@ -1465,6 +1465,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/.../SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.CheckAccount.html.view.verified.json b/.../SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.CheckAccount.html.view.verified.json
@@ -1825,6 +1825,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...ests/SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.Distance.html.view.verified.json b/...ests/SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.Distance.html.view.verified.json
@@ -1077,6 +1077,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...napshot.Tests/SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.html.view.verified.json b/...napshot.Tests/SamplesTest.CSharp/api/CSharp12.PrimaryConstructors.html.view.verified.json
@@ -669,6 +669,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp12.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp12.html.view.verified.json
@@ -598,6 +598,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...t.Tests/SamplesTest.CSharp/api/CSharp8.DefaultInterfaceMembers.IA.html.view.verified.json b/...t.Tests/SamplesTest.CSharp/api/CSharp8.DefaultInterfaceMembers.IA.html.view.verified.json
@@ -412,6 +412,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...sts/SamplesTest.CSharp/api/CSharp8.DefaultInterfaceMembers.Nested.html.view.verified.json b/...sts/SamplesTest.CSharp/api/CSharp8.DefaultInterfaceMembers.Nested.html.view.verified.json
@@ -669,6 +669,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...shot.Tests/SamplesTest.CSharp/api/CSharp8.DefaultInterfaceMembers.html.view.verified.json b/...shot.Tests/SamplesTest.CSharp/api/CSharp8.DefaultInterfaceMembers.html.view.verified.json
@@ -1047,6 +1047,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...napshot.Tests/SamplesTest.CSharp/api/CSharp8.DisposableRefStructs.html.view.verified.json b/...napshot.Tests/SamplesTest.CSharp/api/CSharp8.DisposableRefStructs.html.view.verified.json
@@ -840,6 +840,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp8.Issue4007.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp8.Issue4007.html.view.verified.json
@@ -991,6 +991,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp8.Misc.html.view.verified.json b/test/docfx.Snapshot.Tests/SamplesTest.CSharp/api/CSharp8.Misc.html.view.verified.json
@@ -2235,6 +2235,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",

diff --git a/...pshot.Tests/SamplesTest.CSharp/api/CSharp8.NullableReferenceTypes.html.view.verified.json b/...pshot.Tests/SamplesTest.CSharp/api/CSharp8.NullableReferenceTypes.html.view.verified.json
@@ -1231,6 +1231,7 @@
     "themeAuto": "Auto",
     "changeTheme": "Change theme",
     "copy": "Copy",
+    "downloadPdf": "Download PDF",
     "_shared": {}
   },
   "yamlmime": "ManagedReference",