From e197c2e0866610ebe4f3de763e35ba41422b230c Mon Sep 17 00:00:00 2001 From: MeiK Date: Tue, 15 Dec 2020 15:37:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E9=A6=96=E9=A1=B5=E5=9F=BA?= =?UTF-8?q?=E6=9C=AC=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- layouts/_default/baseof.html | 2 +- layouts/partials/footer.html | 23 +- layouts/partials/header.html | 1 + layouts/partials/katex.html | 4 - layouts/partials/menus.html | 2 +- layouts/partials/overview.html | 336 ++--------------------------- layouts/partials/post.html | 1 + layouts/partials/posts.html | 115 ++++++---- layouts/partials/script.html | 9 + layouts/partials/user-profile.html | 5 +- static/js/github-style.js | 100 +++++---- 11 files changed, 175 insertions(+), 423 deletions(-) delete mode 100644 layouts/partials/katex.html diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 84384c2..6d52152 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -5,7 +5,7 @@ {{ partial "header" . }} {{ block "content" . }}{{ end }} - + {{ partial "footer.html" . }} {{ partial "script.html" . }} diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html index 8e75d0e..706f138 100644 --- a/layouts/partials/footer.html +++ b/layouts/partials/footer.html @@ -1,27 +1,20 @@ - \ No newline at end of file diff --git a/layouts/partials/header.html b/layouts/partials/header.html index a622f42..9b0e5cc 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -9,6 +9,7 @@ +
- - \ No newline at end of file diff --git a/layouts/partials/menus.html b/layouts/partials/menus.html index 81756e2..f7a0919 100644 --- a/layouts/partials/menus.html +++ b/layouts/partials/menus.html @@ -19,7 +19,7 @@ Overview - +
- - {{ if ne (len $pinned) 0 }}

- Pinned + {{ $section_title }}

-
    - {{ range (first 6 $pinned) }} + {{ range (first 6 $section) }}
  1. @@ -34,17 +40,19 @@ {{ .Summary | safeHTML }}
    -

    - - + {{ with .Params.tags }} + {{ range $tag := (first 5 .) }} + + + d="M2.5 7.775V2.75a.25.25 0 01.25-.25h5.025a.25.25 0 01.177.073l6.25 6.25a.25.25 0 010 .354l-5.025 5.025a.25.25 0 01-.354 0l-6.25-6.25a.25.25 0 01-.073-.177zm-1.5 0V2.75C1 1.784 1.784 1 2.75 1h5.025c.464 0 .91.184 1.238.513l6.25 6.25a1.75 1.75 0 010 2.474l-5.026 5.026a1.75 1.75 0 01-2.474 0l-6.25-6.25A1.75 1.75 0 011 7.775zM6 5a1 1 0 100 2 1 1 0 000-2z"> - 999 + {{ $tag }} + {{ end }} + {{ end }}

@@ -52,54 +60,6 @@ {{ end }}
- {{ else }} -
-

- Popular posts -

- -
    - {{ range (first 6 (where .Site.RegularPages "Section" "in" (slice "post"))) }} -
  1. -
    -
    -
    - - - - - - {{ .Title }} - -
    - - -
    - {{ .Summary | safeHTML }} -
    - - -

    - - - - - - 999 - -

    -
    -
    -
    2. - {{ end }} -
-
- {{ end }}
{{ $section := where .Site.RegularPages "Section" "in" (slice "post") }} @@ -152,263 +112,11 @@

- Contribution activity + Post activity

-
-
-

- December 2020 -

- - -
- -
- - - - -
-
-
- - - Created 16 - commits in - 4 - repositories - - - - - - - - - - - - -
- -
-
-
-
- - - - - - - - -
- -
- - - - -
-
-
- - - Opened 1 - - pull request in - 1 - repository - - - - - - - - - - - - -
-
- -
- MeiK2333/headful-chrome-launch -
- - 1 - merged - - -
- -
-
-
-
-
-
- - - - - - - - - - - - - - - - - - - - - - -
+ +
diff --git a/layouts/partials/post.html b/layouts/partials/post.html index 828412d..7960232 100644 --- a/layouts/partials/post.html +++ b/layouts/partials/post.html @@ -1,3 +1,4 @@ +
diff --git a/layouts/partials/posts.html b/layouts/partials/posts.html index 883b0d1..5505208 100644 --- a/layouts/partials/posts.html +++ b/layouts/partials/posts.html @@ -1,48 +1,85 @@ {{ define "posts" }} -
- - - -
-
-
    - {{ range .Paginator.Pages }} -
  • -
    -
    -

    - {{ .Title }} -

    -
    - -
    - {{ .Summary | safeHTML }} -
    -
    - Updated - Mon, 02 Jan 2006 15:04:05 -0700 -
    +
    +
    +
    +
    + {{ if eq .Type "tags" }} +
    +
    + {{ len .Pages }} + results + for {{ .Params.title }}
    -
    • +
    + + + + + + Clear filter + +
    +
{{ end }} - - {{ if gt .Paginator.TotalPages 1}} -
-
- {{ if .Paginator.HasPrev }} - Previous - {{ else }} - - {{ end }} - {{ if .Paginator.HasNext }} - Next - {{ else }} - +
    + {{ range .Paginator.Pages }} +
  • +
    +
    +

    + {{ .Title }} +

    +
    + +
    +
    + {{ .Summary | safeHTML }} +
    +
    + + +
    + {{ with .Params.tags }} + {{ range $tag := (first 5 .) }} + + + + + + {{ $tag }} + + {{ end }} + {{ end }} + + + Updated + + {{ .Lastmod.Format "Mon, 02 Jan 2006 15:04:05 -0700" }} + +
    +
    +
    • {{ end }} +
+
+
+ {{ if .Paginator.HasPrev }} + Previous + {{ else }} + + {{ end }} + {{ if .Paginator.HasNext }} + Next + {{ else }} + + {{ end }} +
- {{ end }}
diff --git a/layouts/partials/script.html b/layouts/partials/script.html index 49fbdc1..b95a3bb 100644 --- a/layouts/partials/script.html +++ b/layouts/partials/script.html @@ -1 +1,10 @@ +{{ if or .Params.math .Site.Params.math }} + + + +{{ end }} diff --git a/layouts/partials/user-profile.html b/layouts/partials/user-profile.html index 00e4636..d955cca 100644 --- a/layouts/partials/user-profile.html +++ b/layouts/partials/user-profile.html @@ -5,6 +5,7 @@
+ {{ with $.Site.Params.avatar }} Avatar + @twitter {{ end }} {{ if .Site.Params.facebook}} - + @facebook {{ end }} diff --git a/static/js/github-style.js b/static/js/github-style.js index c440c67..65feacc 100644 --- a/static/js/github-style.js +++ b/static/js/github-style.js @@ -1,4 +1,5 @@ const months = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']; +const monthsFull = ["January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December"]; const now = new Date(); let contributions; @@ -72,61 +73,65 @@ function monthly(year, month, posts) { ); let liHtml = ''; for (const post of monthPosts) { - liHtml += `
  • - - - - ${post.title} - -
    • `; + liHtml += `
  • +
    + ${post.title} +
    + +
    • `; } let html = `
    -
    -

    - ${months[month]} ${monthPosts.length > 0 ? monthPosts[0].date.getFullYear() : year} +
    +

    + ${monthsFull[month]} ${monthPosts.length > 0 ? monthPosts[0].date.getFullYear() : year}

    -
    -
    +
    + + d="M1 2.5A2.5 2.5 0 013.5 0h8.75a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0V1.5h-8a1 1 0 00-1 1v6.708A2.492 2.492 0 013.5 9h3.25a.75.75 0 010 1.5H3.5a1 1 0 100 2h5.75a.75.75 0 010 1.5H3.5A2.5 2.5 0 011 11.5v-9zm13.23 7.79a.75.75 0 001.06-1.06l-2.505-2.505a.75.75 0 00-1.06 0L9.22 9.229a.75.75 0 001.06 1.061l1.225-1.224v6.184a.75.75 0 001.5 0V9.066l1.224 1.224z"> - - -
      - ${liHtml} -
    + +
    +
    +
    + + + Created ${monthPosts.length} post${monthPosts.length > 1 ? 's' : ''} + + + + + + + + + + + + + + +
    +
      + ${liHtml} +
    +
    +
    +
    -
    - `; +

    `; return html; } @@ -255,6 +260,7 @@ function svgTip(elem, count, dateStr) { } else { svgElem.innerHTML = `No posts on ${dateFmt}`; } + // TODO: 计算位置 svgElem.style.top = `${rect.top - 50}px`; svgElem.style.left = `${rect.left - 78}px`; svgElem.style.display = 'block';