Merge branch 'v1.5' into patch-4

daprdocs/assets/scss/_sidebar-tree.scss

@@ -30,8 +30,8 @@
         }
 
         @include media-breakpoint-up(md) {
-            & > ul {
-                padding-left: .5rem;
+            & .ul-1 ul {
+                padding-left: 1.5em;
             }
         }
 
@@ -85,7 +85,22 @@
 
     & > .td-sidebar-nav__section {
         padding-top: .5rem;
-        padding-left: 0rem;
+        padding-left: 1.5rem;
+    }
+
+    li i { // Layout of icons
+        padding-right: 0.5em;
+        &:before{
+            display: inline-block;
+            text-align: center;
+            min-width: 1em;
+        }
+    }
+
+    .td-sidebar-link.tree-root{
+        font-weight: $font-weight-bold;
+        color: $td-sidebar-tree-root-color;
+        margin-bottom: 1rem;
     }
 }
 
@@ -93,8 +108,7 @@
     @include media-breakpoint-up(md) {
         padding-top: 4rem;
         background-color: $td-sidebar-bg-color;
-        padding-right: .5rem;
-        padding-left: .5rem;
+        padding-right: 1rem;
         border-right: 1px solid $td-sidebar-border-color;
     }
 
@@ -144,4 +158,4 @@
     #content-desktop {display: none;}
     #content-mobile {display: block;}
     }
-}
+}

daprdocs/layouts/partials/footer.html

@@ -1,15 +1,15 @@
 {{ $links := .Site.Params.links }}
 <footer class="bg-dark py-7 row d-print-none">
-  <div class="container-fluid mx-sm-5">
+  <div class="container-fluid mx-sm-5" style="margin-top: 2rem;">
     <div class="row">
-      <div class="col-6 col-sm-2 text-xs-center order-sm-2">
+      <div class="col-6 col-sm-2 text-xs-center order-sm-2" style="margin-top: 1rem;">
         {{ with $links }}
         {{ with index . "user"}}
         {{ template "footer-links-block"  . }}
         {{ end }}
         {{ end }}
       </div>
-      <div class="col-6 col-sm-2 text-right text-xs-center order-sm-3">
+      <div class="col-6 col-sm-2 text-right text-xs-center order-sm-3" style="margin-top: 1rem;">
         {{ with $links }}
         {{ with index . "developer"}}
         {{ template "footer-links-block"  . }}
@@ -17,7 +17,6 @@
         {{ end }}
       </div>
       <div class="col-12 col-sm-6 text-center py-2 order-sm-2">
-        {{ with .Site.Params }}<small class="text-white">&copy; {{ .copyright }} {{ now.Year}} | {{ .distributed | markdownify }}</small>{{ end }}<br></br>
         {{ with .Site.Params }}<small class="text-white">&copy; {{ now.Year}} {{ .trademark | markdownify }}</small>{{ end }}
   {{ if not .Site.Params.ui.footer_about_disable }}
 		{{ with .Site.GetPage "about" }}<p class="mt-2"><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>{{ end }}

daprdocs/layouts/partials/sidebar-tree.html

@@ -1,47 +0,0 @@
-{{/* We cache this partial for bigger sites and set the active class client side. */}}
-{{ $shouldDelayActive := ge (len .Site.Pages) 2000 }}
-<div id="td-sidebar-menu" class="td-sidebar__inner{{ if $shouldDelayActive }} d-none{{ end }}">
-  {{ if not .Site.Params.ui.sidebar_search_disable }}
-  <form class="td-sidebar__search d-flex align-items-center">
-    {{ partial "search-input.html" . }}
-    <button class="btn btn-link td-sidebar__toggle d-md-none p-0 ml-3 fas fa-bars" type="button" data-toggle="collapse" data-target="#td-section-nav" aria-controls="td-docs-nav" aria-expanded="false" aria-label="Toggle section navigation">
-    </button>
-  </form>
-  {{ end }}
-  <nav class="collapse td-sidebar-nav pt-2 pl-4" id="td-section-nav">
-    {{ if  (gt (len .Site.Home.Translations) 0) }}
-    <div class="nav-item dropdown d-block d-lg-none">
-      {{ partial "navbar-lang-selector.html" . }}
-    </div>
-    {{ end }}
-    {{ template "section-tree-nav-section" (dict "page" . "section" .Site.Home "delayActive" $shouldDelayActive)  }}
-  </nav>
-</div>
-{{ define "section-tree-nav-section" }}
-{{ $s := .section }}
-{{ $p := .page }}
-{{ $shouldDelayActive := .delayActive }}
-{{ $active := eq $p.CurrentSection $s }}
-{{ $show := or (not $p.Site.Params.ui.sidebar_menu_compact) ($p.IsDescendant $s) }}
-{{ $sid := $s.RelPermalink | anchorize }}
-<ul class="td-sidebar-nav__section pr-md-3">
-  <li class="td-sidebar-nav__section-title">
-    <a  href="{{ $s.RelPermalink }}" class="align-left pl-0 pr-2{{ if not $show }} collapsed{{ end }}{{ if $active}} active{{ end }} td-sidebar-link td-sidebar-link__section">{{ $s.LinkTitle }}</a>
-  </li>
-  <ul>
-    <li class="collapse {{ if $show }}show{{ end }}" id="{{ $sid }}">
-      {{ $pages := where (union $s.Pages $s.Sections).ByWeight ".Params.toc_hide" "!=" true }}
-      {{ $pages := $pages | first 50 }}
-      {{ range $pages }}
-      {{ if and (.IsPage) (not .Params.nomenu) }}
-      {{ $mid := printf "m-%s" (.RelPermalink | anchorize) }}
-      {{ $active := eq . $p }}
-      <a class="td-sidebar-link td-sidebar-link__page {{ if and (not $shouldDelayActive) $active }} active{{ end }}" id="{{ $mid }}" href="{{ .RelPermalink }}">{{ .LinkTitle }}</a>
-      {{ else if not .Params.toc_hide }}
-      {{ template "section-tree-nav-section" (dict "page" $p "section" .) }}
-      {{ end }}
-      {{ end }}
-    </li>
-  </ul>
-</ul>
-{{ end }}

daprdocs/themes/docsy

@@ -1 +1 @@
-Subproject commit c36be07b2dcb9aa5aa01bad6ed0f8e111dd0452c
+Subproject commit 43361e98f128082158c479ecb94008f29dc8f4e0