dapr
/
docs
mirror of https://github.com/dapr/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

merge conflict 

Signed-off-by: Hannah Hunter <hannahhunter@microsoft.com>
This commit is contained in:
Hannah Hunter 2023-06-07 18:44:39 -04:00
parent 085ea49c16 8a58c8ded0
commit 37b543860d
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
daprdocs/layouts/partials/footer.html
View File

@ -5,26 +5,28 @@
<div class="col-6 col-sm-2 text-xs-center order-sm-2" style="margin-top: 1rem;"> <div class="col-6 col-sm-2 text-xs-center order-sm-2" style="margin-top: 1rem;">
{{ with $links }} {{ with $links }}
{{ with index . "user"}} {{ with index . "user"}}
{{ template "footer-links-block" . }} {{ template "footer-links-block" . }}
{{ end }} {{ end }}
{{ end }} {{ end }}
</div> </div>
<div class="col-6 col-sm-2 text-right text-xs-center order-sm-3" style="margin-top: 1rem;"> <div class="col-6 col-sm-2 text-right text-xs-center order-sm-3" style="margin-top: 1rem;">
{{ with $links }} {{ with $links }}
{{ with index . "developer"}} {{ with index . "developer"}}
{{ template "footer-links-block" . }} {{ template "footer-links-block" . }}
{{ end }} {{ end }}
{{ end }} {{ end }}
</div> </div>
<div class="col-12 col-sm-6 text-center py-2 order-sm-2"> <div class="col-12 col-sm-6 text-center py-2 order-sm-2">
{{ with .Site.Params }}<small class="text-white">&copy; {{ now.Year}} {{ .trademark | markdownify }}</small>{{ end }} {{ with .Site.Params }}<small class="text-white">&copy; {{ now.Year}} {{ .trademark | markdownify }}</small>{{ end }}
{{ if not .Site.Params.ui.footer_about_disable }} {{ if not .Site.Params.ui.footer_about_disable }}
{{ with .Site.GetPage "about" }}<p class="mt-2"><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>{{ end }} {{ with .Site.GetPage "about" }}<p class="mt-2"><a href="{{ .RelPermalink }}">{{ .Title }}</a></p>{{ end }}
{{ end }} {{ end }}
</div> </div>
</div> </div>
</div> </div>
<img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=4848fb3b-3edb-4329-90a9-a9d79afff054" /> <img referrerpolicy="no-referrer-when-downgrade" src="https://static.scarf.sh/a.png?x-pxid=4848fb3b-3edb-4329-90a9-a9d79afff054" />
<script> (function (ss, ex) { window.ldfdr = window.ldfdr || function () { (ldfdr._q = ldfdr._q || []).push([].slice.call(arguments)); }; (function (d, s) { fs = d.getElementsByTagName(s)[0]; function ce(src) { var cs = d.createElement(s); cs.src = src; cs.async = 1; fs.parentNode.insertBefore(cs, fs); }; ce('https://sc.lfeeder.com/lftracker_v1_' + ss + (ex ? '_' + ex : '') + '.js'); })(document, 'script'); })('JMvZ8gblPjda2pOd'); </script>
<script async src="https://tag.clearbitscripts.com/v1/pk_3f4df076549ad932eda451778a42b09b/tags.js" referrerpolicy="strict-origin-when-cross-origin"></script>
</footer> </footer>
{{ define "footer-links-block" }} {{ define "footer-links-block" }}
<ul class="list-inline mb-0"> <ul class="list-inline mb-0">