🏗️ Finish the sidebar attributes redesign.

This commit is contained in:
凡梦星尘 2022-06-01 11:49:47 +08:00
parent cea7bd3bc0
commit 5ff613af40
3 changed files with 21 additions and 22 deletions

View File

@ -35,7 +35,7 @@
</div> </div>
<!-- Sidebar --> <!-- Sidebar -->
{{- if ne $P.sidebar.display "remove" }} {{- if ne $P.sidebar.display "remove" }}
{{- partial "sidebar" (dict "P" $P "Page" .Page "Scratch" .Scratch) }} {{- partial "sidebar.html" . }}
{{- end }} {{- end }}
</header> </header>
<!-- Widgets --> <!-- Widgets -->

View File

@ -26,7 +26,7 @@
{{ partial "sidebar/overview" . }} {{ partial "sidebar/overview" . }}
</div> </div>
</div> </div>
{{- if and .P.backTop.enable .P.backTop.sidebar }} {{- if and .Site.Params.backTop.enable .Site.Params.backTop.sidebar }}
<div class="back-to-top animated" role="button" aria-label="{{ T "BackTop" }}"> <div class="back-to-top animated" role="button" aria-label="{{ T "BackTop" }}">
<i class="fa fa-arrow-up"></i> <i class="fa fa-arrow-up"></i>
<span>0%</span> <span>0%</span>

View File

@ -1,49 +1,48 @@
{{- $author := .P.author }} {{- $author := .Site.Params.author }}
{{- $Site := .Page.Site }}
<div class="site-author site-overview-item animated" itemprop="author" itemscope itemtype="http://schema.org/Person"> <div class="site-author site-overview-item animated" itemprop="author" itemscope itemtype="http://schema.org/Person">
{{- with .P.avatar.url }} {{- with .Site.Params.avatar.url }}
<img class="site-author-image" itemprop="image" alt="{{ $author }}" <img class="site-author-image" itemprop="image" alt="{{ $author }}"
src="{{ . }}"> src="{{ . }}">
{{- end }} {{- end }}
<p class="site-author-name" itemprop="name">{{ $author }}</p> <p class="site-author-name" itemprop="name">{{ $author }}</p>
<div class="site-description" itemprop="description">{{ .P.description }}</div> <div class="site-description" itemprop="description">{{ .Site.Params.description }}</div>
</div> </div>
{{- if .P.siteState }} {{- if .Site.Params.siteState }}
<div class="site-state-wrap site-overview-item animated"> <div class="site-state-wrap site-overview-item animated">
<nav class="site-state"> <nav class="site-state">
<div class="site-state-item site-state-posts"> <div class="site-state-item site-state-posts">
<a href="{{ "/archives/" | relLangURL }}"> <a href="{{ "/archives/" | relLangURL }}">
<span class="site-state-item-count">{{ len $Site.RegularPages }}</span> <span class="site-state-item-count">{{ len .Site.RegularPages }}</span>
<span class="site-state-item-name">{{ T "SbPostsLable" }}</span> <span class="site-state-item-name">{{ T "SbPostsLable" }}</span>
</a> </a>
</div> </div>
<div class="site-state-item site-state-categories"> <div class="site-state-item site-state-categories">
<a href="{{ "/categories/" | relLangURL }}"> <a href="{{ "/categories/" | relLangURL }}">
<span class="site-state-item-count">{{ len $Site.Taxonomies.categories }}</span> <span class="site-state-item-count">{{ len .Site.Taxonomies.categories }}</span>
<span class="site-state-item-name">{{ T "SbCatesTitle" }}</span> <span class="site-state-item-name">{{ T "SbCatesTitle" }}</span>
</a> </a>
</div> </div>
<div class="site-state-item site-state-tags"> <div class="site-state-item site-state-tags">
<a href="{{ "/tags/" | relLangURL }}"> <a href="{{ "/tags/" | relLangURL }}">
<span class="site-state-item-count">{{ len $Site.Taxonomies.tags }}</span> <span class="site-state-item-count">{{ len .Site.Taxonomies.tags }}</span>
<span class="site-state-item-name">{{ T "SbTagsTitle" }}</span> <span class="site-state-item-name">{{ T "SbTagsTitle" }}</span>
</a> </a>
</div> </div>
</nav> </nav>
</div> </div>
{{- end }} {{- end }}
{{- if and .P.chat.enable (or (or .P.chatra.enable .P.tidio.enable) .P.gitter.enable) }} {{- if and .Site.Params.chat.enable (or (or .Site.Params.chatra.enable .Site.Params.tidio.enable) .Site.Params.gitter.enable) }}
<div class="sidebar-button site-overview-item animated"> <div class="sidebar-button site-overview-item animated">
<button {{ if .P.gitter.enable }} class="js-gitter-toggle-chat-button" {{ end }}> <button {{ if .Site.Params.gitter.enable }} class="js-gitter-toggle-chat-button" {{ end }}>
{{- if .P.chat.icon }}<i class="{{ .P.chat.icon }}"></i>{{ end }} {{- if .Site.Params.chat.icon }}<i class="{{ .Site.Params.chat.icon }}"></i>{{ end }}
{{ .P.chat.text }} {{ .Site.Params.chat.text }}
</button> </button>
</div> </div>
{{- end }} {{- end }}
<div class="links-of-social site-overview-item animated"> <div class="links-of-social site-overview-item animated">
{{ $si := .P.socialIcons }} {{ $si := .Site.Params.socialIcons }}
{{ range $key,$val := .P.socials }} {{ range $key,$val := .Site.Params.socials }}
{{- $vals := split $val "||" }} {{- $vals := split $val "||" }}
{{- $name := trim (index $vals 0) " " }} {{- $name := trim (index $vals 0) " " }}
{{- $url := trim (index $vals 1) " " }} {{- $url := trim (index $vals 1) " " }}
@ -62,7 +61,7 @@
</div> </div>
{{- $lang := .Scratch.Get "lang" }} {{- $lang := .Scratch.Get "lang" }}
{{- with .P.creativeCommons }} {{- with .Site.Params.creativeCommons }}
{{- if .sidebar }} {{- if .sidebar }}
<div class="cc-license animated" itemprop="license"> <div class="cc-license animated" itemprop="license">
<a href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.{{ substr $lang 0 2 }}" class="cc-opacity" rel="noopener" target="_blank" title="{{ T "CCLinkTitle" }}"> <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/deed.{{ substr $lang 0 2 }}" class="cc-opacity" rel="noopener" target="_blank" title="{{ T "CCLinkTitle" }}">
@ -72,16 +71,16 @@
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- if .P.links }} {{- if .Site.Params.links }}
<div class="links-of-blogroll site-overview-item animated"> <div class="links-of-blogroll site-overview-item animated">
<div class="links-of-blogroll-title"> <div class="links-of-blogroll-title">
{{- if .P.linksSets.icon }} {{- if .Site.Params.linksSets.icon }}
<i class="{{ .P.linksSets.icon }} fa-fw"></i> <i class="{{ .Site.Params.linksSets.icon }} fa-fw"></i>
{{- end }} {{- end }}
{{- .P.linksSets.title }} {{- .Site.Params.linksSets.title }}
</div> </div>
<ul class="links-of-blogroll-list"> <ul class="links-of-blogroll-list">
{{- range $key,$val := .P.links }} {{- range $key,$val := .Site.Params.links }}
{{- $vals := split $val "||" }} {{- $vals := split $val "||" }}
{{- $name := trim (index $vals 0) " " }} {{- $name := trim (index $vals 0) " " }}
{{- $url := trim (index $vals 1) " " }} {{- $url := trim (index $vals 1) " " }}