Merge 5d490fe into f5dc181

dotnet · Mar 19, 2023 · 616dfb5 · 616dfb5
2 parents f5dc181 + 5d490fe
commit 616dfb5
Show file tree

Hide file tree

Showing 20 changed files with 118 additions and 71 deletions.
diff --git a/...AsCode.Build.MemberLevelManagedReference/templates/memberpage/partials/class.tmpl.partial b/...AsCode.Build.MemberLevelManagedReference/templates/memberpage/partials/class.tmpl.partial
@@ -7,7 +7,7 @@
 {{/overload}}
 <h3 id="{{id}}">{{>partials/classSubtitle}}</h3>
 {{#children.0}}
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>

diff --git a/...e.Build.MemberLevelManagedReference/templates/memberpage/partials/collection.tmpl.partial b/...e.Build.MemberLevelManagedReference/templates/memberpage/partials/collection.tmpl.partial
@@ -30,7 +30,7 @@
 </div>
 {{#parameters.0}}
 <h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -53,7 +53,7 @@
 {{/parameters.0}}
 {{#return}}
 <h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -70,7 +70,7 @@
 {{/return}}
 {{#typeParameters.0}}
 <h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>
@@ -91,7 +91,7 @@
 {{/typeParameters.0}}
 {{#fieldValue}}
 <h5 class="fieldValue">{{__global.fieldValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -108,7 +108,7 @@
 {{/fieldValue}}
 {{#propertyValue}}
 <h5 class="propertyValue">{{__global.propertyValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -125,7 +125,7 @@
 {{/propertyValue}}
 {{#eventType}}
 <h5 class="eventType">{{__global.eventType}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -168,7 +168,7 @@
 {{/example}}
 {{#exceptions.0}}
 <h5 class="exceptions">{{__global.exceptions}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>

diff --git a/templates/default/partials/class.header.tmpl.partial b/templates/default/partials/class.header.tmpl.partial
@@ -50,7 +50,7 @@
 </div>
 {{#syntax.parameters.0}}
 <h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -73,7 +73,7 @@
 {{/syntax.parameters.0}}
 {{#syntax.return}}
 <h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -90,7 +90,7 @@
 {{/syntax.return}}
 {{#syntax.typeParameters.0}}
 <h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>

diff --git a/templates/default/partials/class.tmpl.partial b/templates/default/partials/class.tmpl.partial
@@ -28,7 +28,7 @@
 </div>
 {{#parameters.0}}
 <h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -51,7 +51,7 @@
 {{/parameters.0}}
 {{#return}}
 <h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -68,7 +68,7 @@
 {{/return}}
 {{#typeParameters.0}}
 <h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>
@@ -89,7 +89,7 @@
 {{/typeParameters.0}}
 {{#fieldValue}}
 <h5 class="fieldValue">{{__global.fieldValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -106,7 +106,7 @@
 {{/fieldValue}}
 {{#propertyValue}}
 <h5 class="propertyValue">{{__global.propertyValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -123,7 +123,7 @@
 {{/propertyValue}}
 {{#eventType}}
 <h5 class="eventType">{{__global.eventType}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -155,7 +155,7 @@
 {{/example}}
 {{#exceptions.0}}
 <h5 class="exceptions">{{__global.exceptions}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>

diff --git a/templates/default/partials/enum.tmpl.partial b/templates/default/partials/enum.tmpl.partial
@@ -3,7 +3,7 @@
 {{>partials/class.header}}
 {{#children}}
 <h3 id="{{id}}">{{>partials/classSubtitle}}</h3>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>

diff --git a/templates/default/partials/rest.child.tmpl.partial b/templates/default/partials/rest.child.tmpl.partial
@@ -27,7 +27,7 @@
 </div>
 {{#parameters.0}}
 <h5>Parameters</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>Name</th>
@@ -53,7 +53,7 @@
 {{#responses.0}}
 <div class="responses">
   <h5>Responses</h5>
-  <table class="table table-bordered table-striped table-condensed">
+  <table class="table table-bordered table-condensed">
     <thead>
       <tr>
         <th>Status Code</th>

diff --git a/templates/default/partials/uref/class.tmpl.partial b/templates/default/partials/uref/class.tmpl.partial
@@ -28,7 +28,7 @@
 </div>
 {{#parameters.0}}
 <h5 class="parameters">{{__global.parameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -54,7 +54,7 @@
 {{/parameters.0}}
 {{#return}}
 <h5 class="returns">{{__global.returns}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -71,7 +71,7 @@
 {{/return}}
 {{#typeParameters.0}}
 <h5 class="typeParameters">{{__global.typeParameters}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>
@@ -92,7 +92,7 @@
 {{/typeParameters.0}}
 {{#fieldValue}}
 <h5 class="fieldValue">{{__global.fieldValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -109,7 +109,7 @@
 {{/fieldValue}}
 {{#propertyValue}}
 <h5 class="propertyValue">{{__global.propertyValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -126,7 +126,7 @@
 {{/propertyValue}}
 {{#eventType}}
 <h5 class="eventType">{{__global.eventType}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -143,7 +143,7 @@
 {{/eventType}}
 {{#variableValue}}
 <h5 class="variableValue">{{__global.variableValue}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -160,7 +160,7 @@
 {{/variableValue}}
 {{#typeAliasType}}
 <h5 class="typeAliasType">{{__global.typeAliasType}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>
@@ -203,7 +203,7 @@
 {{/example}}
 {{#exceptions.0}}
 <h5 class="exceptions">{{__global.exceptions}}</h5>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>

diff --git a/templates/default/partials/uref/enum.tmpl.partial b/templates/default/partials/uref/enum.tmpl.partial
@@ -3,7 +3,7 @@
 {{>partials/uref/class.header}}
 {{#children}}
 <h3 id="{{id}}">{{>partials/classSubtitle}}</h3>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.name}}</th>

diff --git a/templates/default/partials/uref/namespace.tmpl.partial b/templates/default/partials/uref/namespace.tmpl.partial
@@ -41,7 +41,7 @@
       </div>
       {{#parameters.0}}
       <h5 class="parameters">{{__global.parameters}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.type}}</th>
@@ -67,7 +67,7 @@
       {{/parameters.0}}
       {{#return}}
       <h5 class="returns">{{__global.returns}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.type}}</th>
@@ -84,7 +84,7 @@
       {{/return}}
       {{#typeParameters.0}}
       <h5 class="typeParameters">{{__global.typeParameters}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.name}}</th>
@@ -105,7 +105,7 @@
       {{/typeParameters.0}}
       {{#fieldValue}}
       <h5 class="fieldValue">{{__global.fieldValue}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.type}}</th>
@@ -122,7 +122,7 @@
       {{/fieldValue}}
       {{#propertyValue}}
       <h5 class="propertyValue">{{__global.propertyValue}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.type}}</th>
@@ -139,7 +139,7 @@
       {{/propertyValue}}
       {{#eventType}}
       <h5 class="eventType">{{__global.eventType}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.type}}</th>
@@ -182,7 +182,7 @@
       {{/example}}
       {{#exceptions.0}}
       <h5 class="exceptions">{{__global.exceptions}}</h5>
-      <table class="table table-bordered table-striped table-condensed">
+      <table class="table table-bordered table-condensed">
         <thead>
           <tr>
             <th>{{__global.type}}</th>

diff --git a/templates/default/partials/uref/parameters.tmpl.partial b/templates/default/partials/uref/parameters.tmpl.partial
@@ -2,7 +2,7 @@
 
 {{#properties.0}}
 <h6 class="parameters">Properties</h6>
-<table class="table table-bordered table-striped table-condensed">
+<table class="table table-bordered table-condensed">
   <thead>
     <tr>
       <th>{{__global.type}}</th>

diff --git a/templates/default/styles/docfx.js b/templates/default/styles/docfx.js
@@ -51,7 +51,7 @@ $(function () {
   // Styling for tables in conceptual documents using Bootstrap.
   // See http://getbootstrap.com/css/#tables
   function renderTables() {
-    $('table').addClass('table table-bordered table-striped table-condensed').wrap('<div class=\"table-responsive\"></div>');
+    $('table').addClass('table table-bordered table-condensed').wrap('<div class=\"table-responsive\"></div>');
   }
 
   // Styling for alerts.

diff --git a/templates/modern/layout/_master.tmpl b/templates/modern/layout/_master.tmpl
@@ -42,6 +42,7 @@
           </button>
           <div class="collapse navbar-collapse" id="navbar">
             <form class="d-flex ms-auto" role="search" id="search">
+              <i class="bi bi-search"></i>
               <input class="form-control" id="search-query" type="search" disabled placeholder="{{__global.search}}" autocomplete="off" aria-label="Search">
             </form>
           </div>
@@ -64,7 +65,7 @@
 
       <div class="content">
         <div class="actionbar">
-          <button class="btn btn-lg border-0 d-md-none" style="margin-top: -.5em; margin-left: -.8em"
+          <button class="btn btn-lg border-0 d-md-none" style="margin-top: -.65em; margin-left: -.8em"
               type="button" data-bs-toggle="offcanvas" data-bs-target="#tocOffcanvas"
               aria-controls="tocOffcanvas" aria-expanded="false" aria-label="Show table of contents">
             <i class="bi bi-list"></i>

diff --git a/templates/modern/src/docfx.scss b/templates/modern/src/docfx.scss
@@ -28,7 +28,6 @@ h5,
 h6,
 .xref,
 .text-break {
-  white-space: nowrap;
   word-wrap: break-word;
   word-break: break-word;
 }
@@ -89,6 +88,13 @@ article {
   font-weight: normal;
 }
 
+@mixin underline-on-hover {
+  text-decoration: none;
+  &:hover, &:focus {
+    text-decoration: underline;
+  }
+}
+
 @import "layout.scss";
 @import "nav.scss";
 @import "toc.scss";