ps author

exampleSite toc
uPagge · Dec 3, 2020 · 99551a9 · 99551a9
1 parent cc1ec25
commit 99551a9
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 19 deletions.
diff --git a/assets/css/_custom.scss b/assets/css/_custom.scss
@@ -396,4 +396,8 @@ footer {
   padding: 2rem 0;
 }
 
+.page-toc {
+  margin: 0;
+}
+
 @import "_custom_media";
diff --git a/assets/css/_custom_media.scss b/assets/css/_custom_media.scss
@@ -27,6 +27,14 @@
 }
 
 @media only screen and (max-width: 1200px) {
+  #toc-auto {
+    display: none;
+  }
+
+  #toc-static {
+    display: block;
+  }
+
   .page {
     width: 100%;
   }

diff --git a/assets/js/theme.min.js b/assets/js/theme.min.js
diff --git a/assets/js/theme.min.js.map b/assets/js/theme.min.js.map
diff --git a/exampleSite/assets/css/_custom.scss b/exampleSite/assets/css/_custom.scss
diff --git a/exampleSite/assets/css/_override.scss b/exampleSite/assets/css/_override.scss
diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.en.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.en.md
@@ -119,7 +119,6 @@ Example `instagram` input:
 
 The rendered output looks like this:
 
-{{< instagram BWNjjyYFxVx hidecaption >}}
 
 ## 5 param
 

diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.fr.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.fr.md
@@ -124,7 +124,7 @@ Example `instagram` input:
 
 The rendered output looks like this:
 
-{{< instagram BWNjjyYFxVx hidecaption >}}
+
 
 ## 5 param
 

diff --git a/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.zh-cn.md b/exampleSite/content/posts/theme-documentation-built-in-shortcodes/index.zh-cn.md
@@ -120,7 +120,7 @@ Hugo 附带了一组预定义的 shortcodes, 它们实现了一些非常常见
 
 呈现的输出效果如下:
 
-{{< instagram BWNjjyYFxVx hidecaption >}}
+
 
 ## 5 param
 

diff --git a/exampleSite/data/authors/default.json b/exampleSite/data/authors/default.json
@@ -0,0 +1,8 @@
+{
+  "name": "Struchkov Mark",
+  "nickname": "@uPagge",
+  "bio": "Author Theme",
+  "avatar": "https://upagge.ru/img/ava.jpg",
+  "site": "https://uPagge.ru",
+  "ps": "Статья оказалась полезной? Делай репост &#128070; или <a class=\"donate-link\" href=\"https://www.tinkoff.ru/sl/NSGSK7FgEI\" target=\"_blank\" style=\"border-bottom: dashed 1px;color: #2c678d\"> налей пива</a>"
+}
diff --git a/layouts/partials/function/content.html b/layouts/partials/function/content.html
@@ -1,5 +1,6 @@
 {{- $content := .Content -}}
 
+{{- if ne "" $content -}}
 {{- if .Ruby -}}
     {{- $content = partial "function/ruby.html" $content -}}
 {{- end -}}
@@ -15,5 +16,6 @@
 {{- $content = partial "function/checkbox.html" $content -}}
 
 {{- $content = partial "function/escape.html" $content -}}
+{{- end -}}
 
 {{- return $content -}}
diff --git a/layouts/partials/single/footer.html b/layouts/partials/single/footer.html
@@ -9,17 +9,19 @@
 
 {{ $author := index .Site.Data.authors (.Params.author | default "default") }}
 {{- if $author -}}
-<div class="footer-post-author">
+<div class="footer-post-author" {{- if not $author.ps -}} style="border-radius: 10px" {{- end -}}>
     <div class="author-avatar"><a href="{{ with $author.site }} {{- . | safeHTML -}}{{ end }}" target="_blank"><img alt="" src="{{ with $author.avatar }} {{- . | safeHTML -}}{{ end }}" border="0"></a></div>
     <div class="author-info">
         <div class="name">{{ $author.name }}</div>
         <div class="number-posts">{{ $author.bio }}</span></div>
     </div>
 </div>
+{{- if $author.ps -}}
 <div class="footer-donate">
-    <div>Статья оказалась полезной? Делай репост &#128070; или <a class="donate-link" href="https://www.tinkoff.ru/sl/NSGSK7FgEI" target="_blank" style="border-bottom: dashed 1px;color: #2c678d"> налей пива</a></div>
+    <div>{{- $author.ps | safeHTML -}}</div>
 </div>
 {{- end -}}
+{{- end -}}
 
 <div class="post-footer" id="post-footer">
     <div class="post-info">

diff --git a/layouts/posts/single.html b/layouts/posts/single.html
@@ -19,7 +19,7 @@ <h2 class="toc-title">{{ T "contents" }}</h2>
         </div>
     {{- end -}}
 
-    <article class="page single">
+    <article class="{{- if or .Site.Params.page.toc.keepStatic (not .Site.Params.page.toc.enable) -}}page single {{- else -}}page single page-toc{{- end -}}">
 
         {{- /* Featured image */ -}}
         {{- $image := $params.featuredimage -}}

diff --git a/src/js/theme.js b/src/js/theme.js
@@ -414,7 +414,7 @@ class Theme {
             const $page = document.getElementsByClassName('page')[0];
             const rect = $page.getBoundingClientRect();
             $toc.style.left = `${rect.left + rect.width + 20}px`;
-            $toc.style.maxWidth = `${$page.getBoundingClientRect().left - 20}px`;
+            $toc.style.maxWidth = `${$page.getBoundingClientRect().left - 20 + 314}px`;
             $toc.style.visibility = 'visible';
             const $tocLinkElements = $tocCore.querySelectorAll('a:first-child');
             const $tocLiElements = $tocCore.getElementsByTagName('li');