From 13a2c8742c3a34ef8d137b78e5209b3d4acb02cc Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 02:06:21 +0800 Subject: [PATCH 01/28] WIP: newsletter section page and archives page can work --- layouts/_default/archives.html | 11 ++++-- layouts/_default/baseof.html | 1 + layouts/_default/list.html | 5 +++ layouts/newsletter/section.html | 67 +++++++++++++++++++++++++++++++++ layouts/partials/head.html | 3 +- 5 files changed, 82 insertions(+), 5 deletions(-) create mode 100644 layouts/newsletter/section.html diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 966da8a..c2e7aed 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,7 +1,7 @@ {{- define "main" }}
-

{{ .Title }}

+

{{ .Title }} !

{{- if .Description }}
{{ .Description }} @@ -9,7 +9,12 @@ {{- end }}
-{{- $pages := where site.AllPages "Type" "in" site.Params.mainSections }} +{{- $sections := site.Params.mainSections }} +{{/* with the follow condition, archives.html could be used for section archives other than the only one archives of the whole site */}} +{{- if .Section }} + {{- $sections = .Section}} +{{- end }} +{{- $pages := where site.AllPages "Type" "in" $sections }} {{- range $pages.GroupByPublishDate "2006" }} {{- if ne .Key "0001" }} @@ -22,7 +27,6 @@

{{- .Key }}  {{ len .Pages }}

{{- range .Pages }} - {{- if eq .Kind "page" }}

{{- .Title | markdownify }} @@ -34,7 +38,6 @@

{{- end }} - {{- end }}
{{- end }} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 513450b..e74c03e 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -13,6 +13,7 @@ {{- if eq site.Params.defaultTheme `dark` -}} {{- print " dark" }} {{- end -}} +{{- block "bodyClass" . }}{{ end }} " id="top"> {{- partialCached "header.html" . .Page -}}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index e2c248c..f92963d 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -13,6 +13,11 @@ {{ .Description | markdownify }} {{- end }} + {{- with .Param "archivesSlug" }} +
+ Archives +
+ {{- end }} {{- end }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html new file mode 100644 index 0000000..07aab27 --- /dev/null +++ b/layouts/newsletter/section.html @@ -0,0 +1,67 @@ +{{/* section is AKA list */}} +{{- define "bodyClass" }} theme-newsletter{{- end }} + +{{- define "main" }} + + +
+

{{ .Title }} Newsletter

+ {{- with .Param "archivesSlug" }} +
+ Archives +
+ {{- end }} +
+ +{{- $pages := where .Pages "Params.hidden" "!=" true }} + +{{/* related issue: https://github.com/gohugoio/hugo/issues/9003 */}} +{{ $paginator := "" }} +{{ if (.Param "paginate") }} + {{- $paginator = .Paginate $pages (.Param "paginate") }} +{{ else }} + {{- $paginator = .Paginate $pages }} +{{ end }} + + +{{- range $index, $page := $paginator.Pages }} +
+
+

+ {{- .Title }} + {{- if .Draft }}  [Draft]{{- end }} + {{- if .Weight }}  [Pinned]{{- end }} +

+
+ {{- if (ne (.Param "hideSummary") true) }} +
+ {{ if .Description }} +

{{ .Description | plainify | htmlUnescape }}

+ {{ else }} +

{{ .Summary | plainify | htmlUnescape }}{{ if .Truncated }}...{{ end }}

+ {{ end }} +
+ {{- end }} + {{- if not (.Param "hideMeta") }} +
+ {{- partial "post_meta.html" . -}} +
+ {{- end }} + +
+{{- end }} + +{{- if gt $paginator.TotalPages 1 }} + +{{- end }} + +{{ end }} diff --git a/layouts/partials/head.html b/layouts/partials/head.html index 1889a85..3ced6b6 100644 --- a/layouts/partials/head.html +++ b/layouts/partials/head.html @@ -47,10 +47,11 @@ {{- /* order is important */}} {{- $core := (slice $theme_vars $reset $common $commonHighlight $media) | resources.Concat "assets/css/core.css" }} {{- $extended := (resources.Match "css/extended/*.css") | resources.Concat "assets/css/extended.css" }} +{{- $extendedScss := (resources.Match "css/extended/*.scss") | resources.Concat "assets/css/extended.scss" | resources.ToCSS }} {{- /* bundle all required css */}} {{- /* Add extended css after theme style */ -}} -{{- $stylesheet := (slice $core $extended) | resources.Concat "assets/css/stylesheet.css" | minify }} +{{- $stylesheet := (slice $core $extended $extendedScss) | resources.Concat "assets/css/stylesheet.css" | minify }} {{- if not site.Params.assets.disableFingerprinting }} {{- $stylesheet := $stylesheet | fingerprint }} From 44533c76bbe3dbd176b350a26f3ac748023d4c9f Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 12:22:54 +0800 Subject: [PATCH 02/28] menu link is active for being the prefix of current url --- layouts/partials/header.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/partials/header.html b/layouts/partials/header.html index 1061d5b..01f2b41 100644 --- a/layouts/partials/header.html +++ b/layouts/partials/header.html @@ -133,7 +133,7 @@ function toggleThemeListener() { {{- .Pre }} From 62288bcb5661de24f23f2a0e26511ac0fe749467 Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 13:47:52 +0800 Subject: [PATCH 03/28] enhance post-footer spacing --- assets/css/common/post-single.css | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index 1efd99a..91d7ee8 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -401,6 +401,8 @@ h6:hover .anchor { .post-footer { margin-top: calc(var(--content-gap) * 1.5); + padding-bottom: calc(var(--content-gap) * 2); + border-bottom: 1px solid var(--tertiary); } .share-buttons { @@ -453,7 +455,7 @@ h6:hover .anchor { } .paginav { - margin: var(--content-gap) 0; + margin-top: var(--content-gap); display: flex; line-height: 30px; border-radius: var(--radius); @@ -574,10 +576,7 @@ h6:hover .anchor { } .comments { - border-top: 1px solid var(--tertiary); -} -.comments { - margin: 40px 0 20px; + margin: var(--content-gap) 0; } .comments .title { margin: 20px 0; From a016d836633b6e223d1ac3ee0ddb262eca0d626d Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 13:53:15 +0800 Subject: [PATCH 04/28] home page filter pages use "Section in" instead of "Type in" distinguish .Section and .Type --- layouts/_default/list.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f92963d..5797a30 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -32,7 +32,7 @@ {{- $pages := .Pages }} {{- if .IsHome }} - {{- $pages = where site.RegularPages "Type" "in" site.Params.mainSections }} + {{- $pages = where site.RegularPages "Section" "in" site.Params.mainSections }} {{- end }} {{- $pages = where $pages "Params.hidden" "!=" true }} From ca373fd00303c93ed62eafa55696ab03d23667b2 Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 15:19:46 +0800 Subject: [PATCH 05/28] add type- and kind- classes to body, styling newsletter single and section --- assets/css/extended/newsletter.scss | 99 +++++++++++++++++++++++++++++ layouts/_default/baseof.html | 3 +- layouts/_default/single.html | 22 ++++++- layouts/newsletter/section.html | 5 +- 4 files changed, 121 insertions(+), 8 deletions(-) create mode 100644 assets/css/extended/newsletter.scss diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss new file mode 100644 index 0000000..0dc5235 --- /dev/null +++ b/assets/css/extended/newsletter.scss @@ -0,0 +1,99 @@ +/* +color candidates: +#CB3A56 茜色 +#F05654 銀紅 +#F20C00 石榴紅 +#FF2D51 火紅 +*/ +body.type-newsletter { + --signature: #CB3A56; + --signature-bg: rgba(203, 58, 87, 0.239); + --signature-bg-dim: rgba(203, 58, 87, 0.147); + --main-border: 5px solid var(--signature); + --link-hover-color: var(--signature); + + + /* regular page layout */ +} + +body.type-newsletter.kind-section { + /* section page layout */ + + .main { + border: var(--main-border); + background-color: var(--theme); + margin-top: var(--content-gap); + min-height: calc(100vh - var(--header-height) - var(--footer-height) - var(--content-gap)); + max-width: calc(var(--nav-width)); + } + + .main-logo { + position: absolute; + left: 0; top: 0; + width: 50px; + height: 50px; + line-height: 45px; + border-right: var(--main-border); + border-bottom: var(--main-border); + background-color: var(--signature); + color: var(--theme); + font-size: 32px; + text-align: center; + } +} + +body.type-newsletter.kind-page { + .newsletter-brand { + display: flex; + background-color: var(--signature-bg-dim); + transition: var(--link-transition); + font-size: 32px; + margin-bottom: calc(var(--content-gap) * 2); + line-height: 50px; + + .icon, .name { + height: 50px; + } + .icon { + width: 50px; + color: var(--theme); + text-align: center; + background-color: var(--signature); + } + .name { + padding: 0 20px; + font-weight: bolder; + color: var(--signature); + } + .issueno { + color: var(--signature); + font-weight: 300; + transition: var(--link-transition); + } + .arrow { + margin-left: auto; + color: transparent; + display: flex; + align-items: center; + padding-right: 15px; + transition: var(--link-transition); + } + + &:hover, &:active { + background-color: var(--signature-bg); + .arrow { + color: var(--signature); + } + .issueno { + color: transparent; + } + } + } + + .post-title { + font-size: 36px; + } + .post-footer { + border-bottom: 0; + } +} diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index e74c03e..0d78fad 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,8 +12,7 @@ {{- end -}} {{- if eq site.Params.defaultTheme `dark` -}} {{- print " dark" }} -{{- end -}} -{{- block "bodyClass" . }}{{ end }} +{{- end }} type-{{ .Type }} kind-{{ .Kind -}} " id="top"> {{- partialCached "header.html" . .Page -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index c71f66d..7109cdb 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,15 +1,31 @@ {{- define "main" }} +{{- $isNewsletter := eq .Type "newsletter" }}
{{ partial "breadcrumbs.html" . }} + + {{- if $isNewsletter -}} + + {{- end -}}

- {{ .Title }} - {{- if .Draft }}  [draft]{{- end }} + {{- if $isNewsletter -}} + {{- replace .Title (.Param "titlePrefix") (.Param "titlePrefixReplace") -}} + {{- else -}} + {{- .Title -}} + {{- end -}} + {{- if .Draft -}}  [draft]{{- end -}}

{{- if .Description }}
- {{ .Description }} + {{- .Description -}}
{{- end }} {{- if not (.Param "hideMeta") }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 07aab27..344810a 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -1,11 +1,10 @@ {{/* section is AKA list */}} -{{- define "bodyClass" }} theme-newsletter{{- end }} {{- define "main" }} - +
-

{{ .Title }} Newsletter

+

{{ .Title }}

{{- with .Param "archivesSlug" }}
Archives From 2f47e7cff86f06f6c392bcf7e3e260c9fb57297e Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 15:25:44 +0800 Subject: [PATCH 06/28] class name change: main-logo -> main-icon --- assets/css/extended/newsletter.scss | 13 +++++++------ layouts/newsletter/section.html | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 0dc5235..a514d5e 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -11,6 +11,7 @@ body.type-newsletter { --signature-bg-dim: rgba(203, 58, 87, 0.147); --main-border: 5px solid var(--signature); --link-hover-color: var(--signature); + --icon-length: 50px; /* regular page layout */ @@ -27,11 +28,11 @@ body.type-newsletter.kind-section { max-width: calc(var(--nav-width)); } - .main-logo { + .main-icon { position: absolute; left: 0; top: 0; - width: 50px; - height: 50px; + width: var(--icon-length); + height: var(--icon-length); line-height: 45px; border-right: var(--main-border); border-bottom: var(--main-border); @@ -49,13 +50,13 @@ body.type-newsletter.kind-page { transition: var(--link-transition); font-size: 32px; margin-bottom: calc(var(--content-gap) * 2); - line-height: 50px; + line-height: var(--icon-length); .icon, .name { - height: 50px; + height: var(--icon-length); } .icon { - width: 50px; + width: var(--icon-length); color: var(--theme); text-align: center; background-color: var(--signature); diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 344810a..e64f285 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -1,7 +1,7 @@ {{/* section is AKA list */}} {{- define "main" }} - +
＠

{{ .Title }}

From ea271b565162f9a4144b97c23dbce3135403e094 Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 15:37:31 +0800 Subject: [PATCH 07/28] split partial newsletter_brand --- assets/css/extended/newsletter.scss | 10 ++++++++-- layouts/_default/single.html | 13 +++++-------- layouts/partials/newsletter_brand.html | 8 ++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) create mode 100644 layouts/partials/newsletter_brand.html diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index a514d5e..9418592 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -41,6 +41,12 @@ body.type-newsletter.kind-section { font-size: 32px; text-align: center; } + + .page-header { + h1 { + text-align: center; + } + } } body.type-newsletter.kind-page { @@ -66,7 +72,7 @@ body.type-newsletter.kind-page { font-weight: bolder; color: var(--signature); } - .issueno { + .remark { color: var(--signature); font-weight: 300; transition: var(--link-transition); @@ -85,7 +91,7 @@ body.type-newsletter.kind-page { .arrow { color: var(--signature); } - .issueno { + .remark { color: transparent; } } diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 7109cdb..9c68c5a 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -6,14 +6,7 @@ {{ partial "breadcrumbs.html" . }} {{- if $isNewsletter -}} - + {{- partial "newsletter_brand.html" . }} {{- end -}}

{{- if $isNewsletter -}} @@ -59,6 +52,10 @@ {{- if (.Param "ShowPostNavLinks") }} {{- partial "post_nav_links.html" . }} {{- end }} + + {{- if $isNewsletter }} + {{- partial "newsletter_sub_form.html"}} + {{- end }} {{- if not (.Param "noComments") }} diff --git a/layouts/partials/newsletter_brand.html b/layouts/partials/newsletter_brand.html new file mode 100644 index 0000000..03c10ee --- /dev/null +++ b/layouts/partials/newsletter_brand.html @@ -0,0 +1,8 @@ + From ceede2988aa86ad19a2ff84bb3eb76b91b8dd4da Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 16:20:55 +0800 Subject: [PATCH 08/28] move .first-entry css to main.css, styling newsletter section --- assets/css/common/main.css | 47 +++++++++++- assets/css/common/post-entry.css | 43 ----------- assets/css/extended/newsletter.scss | 8 +- layouts/_default/archives.html | 2 +- layouts/newsletter/section.html | 114 +++++++++++++++------------- 5 files changed, 113 insertions(+), 101 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index 004de15..d1dd1c3 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -14,7 +14,7 @@ } mark { margin: 0 -0.4em; - padding: 0.1em 0.4em; + padding: 0em 0.4em; border-radius: 0.8em 0.3em; background: transparent; background-image: linear-gradient( @@ -27,6 +27,51 @@ mark { box-decoration-break: clone; } +/* for home and section page */ +.first-entry { + position: relative; + min-height: 320px; + margin: var(--gap) 0 calc(var(--gap) * 2) 0; +} + +.first-entry .entry-header { + overflow: hidden; + display: -webkit-box; + -webkit-box-orient: vertical; + margin: var(--gap) 0 calc(var(--gap) * 2); +} + +.first-entry .entry-header h1 { + font-size: 34px; + line-height: 1.3; +} +@media screen and (max-width: 400px) { + .first-entry .entry-header h1 { + font-size: 30px; + } +} + +.first-entry .entry-content { + margin: 14px 0; + font-size: 17px; + color: var(--primary); + line-height: 1.6em; + display: block; + overflow: initial; /* fix edge get cut */ +} + +.first-entry .entry-content p { + margin-bottom: .8em; +} +.first-entry .entry-content li p { + margin-bottom: .5em; +} + +.first-entry .entry-footer { + font-size: 14px; +} + + /* for post page */ .main.post { max-width: calc(var(--post-width) + var(--gap) * 2); diff --git a/assets/css/common/post-entry.css b/assets/css/common/post-entry.css index 81ba641..e433cc1 100644 --- a/assets/css/common/post-entry.css +++ b/assets/css/common/post-entry.css @@ -1,46 +1,3 @@ -.first-entry { - position: relative; - min-height: 320px; - margin: var(--gap) 0 calc(var(--gap) * 2) 0; -} - -.first-entry .entry-header { - overflow: hidden; - display: -webkit-box; - -webkit-box-orient: vertical; - margin: var(--gap) 0 calc(var(--gap) * 2); -} - -.first-entry .entry-header h1 { - font-size: 34px; - line-height: 1.3; -} -@media screen and (max-width: 400px) { - .first-entry .entry-header h1 { - font-size: 30px; - } -} - -.first-entry .entry-content { - margin: 14px 0; - font-size: 17px; - color: var(--primary); - line-height: 1.6em; - display: block; - overflow: initial; /* fix edge get cut */ -} - -.first-entry .entry-content p { - margin-bottom: .8em; -} -.first-entry .entry-content li p { - margin-bottom: .5em; -} - -.first-entry .entry-footer { - font-size: 14px; -} - .home-info .entry-content { -webkit-line-clamp: unset; } diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 9418592..899ed78 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -42,8 +42,12 @@ body.type-newsletter.kind-section { text-align: center; } - .page-header { - h1 { + .main { + .content { + max-width: calc(var(--post-width)); + margin: 0 auto; + } + .entry-header h1 { text-align: center; } } diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index c2e7aed..285b592 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,7 +1,7 @@ {{- define "main" }}
-

{{ .Title }} !

+

{{ .Title }}

{{- if .Description }}
{{ .Description }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index e64f285..47901f3 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -3,64 +3,70 @@ {{- define "main" }}
＠
-
-

{{ .Title }}

+
+
+
+

{{ .Title }}

+
+
{{ .Description | markdownify }}
+
+ + {{- $pages := where .Pages "Params.hidden" "!=" true }} + + {{/* related issue: https://github.com/gohugoio/hugo/issues/9003 */}} + {{ $paginator := "" }} + {{ if (.Param "paginate") }} + {{- $paginator = .Paginate $pages (.Param "paginate") }} + {{ else }} + {{- $paginator = .Paginate $pages }} + {{ end }} + + + {{- range $index, $page := $paginator.Pages }} +
+
+

+ {{- .Title }} + {{- if .Draft }}  [Draft]{{- end }} + {{- if .Weight }}  [Pinned]{{- end }} +

+
+ {{- if (ne (.Param "hideSummary") true) }} +
+ {{ if .Description }} +

{{ .Description | plainify | htmlUnescape }}

+ {{ else }} +

{{ .Summary | plainify | htmlUnescape }}{{ if .Truncated }}...{{ end }}

+ {{ end }} +
+ {{- end }} + {{- if not (.Param "hideMeta") }} +
+ {{- partial "post_meta.html" . -}} +
+ {{- end }} + +
+ {{- end }} + + {{- if gt $paginator.TotalPages 1 }} + + {{- end }} + {{- with .Param "archivesSlug" }} {{- end }} -
- -{{- $pages := where .Pages "Params.hidden" "!=" true }} - -{{/* related issue: https://github.com/gohugoio/hugo/issues/9003 */}} -{{ $paginator := "" }} -{{ if (.Param "paginate") }} - {{- $paginator = .Paginate $pages (.Param "paginate") }} -{{ else }} - {{- $paginator = .Paginate $pages }} -{{ end }} - - -{{- range $index, $page := $paginator.Pages }} -
-
-

- {{- .Title }} - {{- if .Draft }}  [Draft]{{- end }} - {{- if .Weight }}  [Pinned]{{- end }} -

-
- {{- if (ne (.Param "hideSummary") true) }} -
- {{ if .Description }} -

{{ .Description | plainify | htmlUnescape }}

- {{ else }} -

{{ .Summary | plainify | htmlUnescape }}{{ if .Truncated }}...{{ end }}

- {{ end }} -
- {{- end }} - {{- if not (.Param "hideMeta") }} -
- {{- partial "post_meta.html" . -}} -
- {{- end }} - -
-{{- end }} - -{{- if gt $paginator.TotalPages 1 }} - -{{- end }} +
{{ end }} From c33e025fe22502466c4f53afe398e7ca77a00e4f Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 16:49:18 +0800 Subject: [PATCH 09/28] styling newsletter sub form --- assets/css/extended/newsletter.scss | 38 ++++++++++++++++++++++- layouts/_default/single.html | 2 +- layouts/newsletter/section.html | 1 + layouts/partials/newsletter_sub_form.html | 8 +++++ 4 files changed, 47 insertions(+), 2 deletions(-) create mode 100644 layouts/partials/newsletter_sub_form.html diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 899ed78..6b955d0 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -13,8 +13,43 @@ body.type-newsletter { --link-hover-color: var(--signature); --icon-length: 50px; + /* shared */ + .sub-form { + display: flex; + flex-direction: column; + margin: calc(var(--content-gap) * 1.5) 0; + form { + display: flex; + justify-content: space-between; + align-items: center; + line-height: 1.2em; + } + input { + border: 3px solid var(--signature-bg-dim); + color: var(--secondary); + border-radius: 0px; + appearance: none; + outline: none; + background-color: var(--theme); + padding: 9px 15px; + max-width: 100%; + width: 100%; + transition: var(--link-transition); - /* regular page layout */ + &:focus { + color: var(--primary); + border-color: var(--signature); + } + } + button { + display: block; + background-color: var(--signature); + color: var(--theme); + padding: 12px 15px; + margin-left: 20px; + white-space: nowrap; + } + } } body.type-newsletter.kind-section { @@ -53,6 +88,7 @@ body.type-newsletter.kind-section { } } +/* egular page layout */ body.type-newsletter.kind-page { .newsletter-brand { display: flex; diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 9c68c5a..6fff034 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -54,7 +54,7 @@ {{- end }} {{- if $isNewsletter }} - {{- partial "newsletter_sub_form.html"}} + {{- partial "newsletter_sub_form.html"}} {{- end }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 47901f3..2863335 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -9,6 +9,7 @@

{{ .Title }}

{{ .Description | markdownify }}
+ {{- partial "newsletter_sub_form.html"}}

{{- $pages := where .Pages "Params.hidden" "!=" true }} diff --git a/layouts/partials/newsletter_sub_form.html b/layouts/partials/newsletter_sub_form.html new file mode 100644 index 0000000..3cee447 --- /dev/null +++ b/layouts/partials/newsletter_sub_form.html @@ -0,0 +1,8 @@ +{{/* Add `layouts/partials/newsletter_sub_form.html` in your own code to customize the form */}} + +
+
+ + +
+
From b816797316ef1e79dcf49ba7d658be2c3d3c8f9d Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 21:47:14 +0800 Subject: [PATCH 10/28] rename .list to .list-page --- assets/css/core/reset.css | 4 ++-- assets/css/core/theme-vars.css | 4 ++-- assets/css/core/zmedia.css | 2 +- layouts/_default/baseof.html | 2 +- layouts/partials/head.html | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/assets/css/core/reset.css b/assets/css/core/reset.css index 7053b0b..994d3ed 100644 --- a/assets/css/core/reset.css +++ b/assets/css/core/reset.css @@ -117,7 +117,7 @@ img { background: 0 0; } -.list:not(.dark)::-webkit-scrollbar-track { +.list-page:not(.dark)::-webkit-scrollbar-track { background: var(--code-bg); } @@ -127,7 +127,7 @@ img { border-radius: var(--radius); } -.list:not(.dark)::-webkit-scrollbar-thumb { +.list-page:not(.dark)::-webkit-scrollbar-thumb { border: 5px solid var(--code-bg); } diff --git a/assets/css/core/theme-vars.css b/assets/css/core/theme-vars.css index 7980b48..e3dd503 100644 --- a/assets/css/core/theme-vars.css +++ b/assets/css/core/theme-vars.css @@ -47,10 +47,10 @@ --link-hover-underline-shadow: 0 2px 0 var(--link-hover-underline-color); } -.list { +.list-page { background: var(--code-bg); } -.dark.list { +.dark.list-page { background: var(--theme); } diff --git a/assets/css/core/zmedia.css b/assets/css/core/zmedia.css index 1cc6c6e..d600c80 100644 --- a/assets/css/core/zmedia.css +++ b/assets/css/core/zmedia.css @@ -39,7 +39,7 @@ /* footer */ @media screen and (max-width: 900px) { - .list .top-link { + .list-page .top-link { transform: translateY(-5rem); } } diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index 0d78fad..bf74e92 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -8,7 +8,7 @@ Date: Wed, 7 Sep 2022 22:29:52 +0800 Subject: [PATCH 11/28] styling newsletter section list --- assets/css/extended/newsletter.scss | 57 +++++++++++++++++++-- layouts/newsletter/section.html | 77 ++++++++++------------------- 2 files changed, 80 insertions(+), 54 deletions(-) diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 6b955d0..776463d 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -59,6 +59,7 @@ body.type-newsletter.kind-section { border: var(--main-border); background-color: var(--theme); margin-top: var(--content-gap); + padding-bottom: var(--icon-length); min-height: calc(100vh - var(--header-height) - var(--footer-height) - var(--content-gap)); max-width: calc(var(--nav-width)); } @@ -82,13 +83,63 @@ body.type-newsletter.kind-section { max-width: calc(var(--post-width)); margin: 0 auto; } - .entry-header h1 { - text-align: center; + + .first-entry { + margin-bottom: 0; + + .entry-header h1 { + text-align: center; + } + // .entry-content { + // font-size: 16px; + // } + } + + .list { + display: flex; + flex-direction: column; + margin-bottom: var(--content-gap); + + .item { + display: flex; + border-bottom: 1px solid var(--tertiary-bg); + padding: 8px 0; + + .date, .issueno { + font-size: .9em; + color: var(--secondary); + } + .date { + width: 150px; + } + .title { + flex-grow: 1; + font-weight: 500; + a { + display: block; + width: 100%; + } + a:hover, a:active { + color: var(--signature); + } + em { + color: var(--secondary); + font-style: normal; + font-size: .8em; + margin-inline-start: 1em; + vertical-align: top; + } + } + .issueno { + width: 50px; + text-align: right; + } + } } } } -/* egular page layout */ +/* regular page layout */ body.type-newsletter.kind-page { .newsletter-brand { display: flex; diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 2863335..486aa8d 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -7,6 +7,7 @@

{{ .Title }}

+ {{ with .Param "subtitle" }}
{{ . }}
{{ end }}
{{ .Description | markdownify }}
{{- partial "newsletter_sub_form.html"}} @@ -14,60 +15,34 @@ {{- $pages := where .Pages "Params.hidden" "!=" true }} - {{/* related issue: https://github.com/gohugoio/hugo/issues/9003 */}} - {{ $paginator := "" }} - {{ if (.Param "paginate") }} - {{- $paginator = .Paginate $pages (.Param "paginate") }} - {{ else }} - {{- $paginator = .Paginate $pages }} - {{ end }} - - {{- range $index, $page := $paginator.Pages }} -
-
-

- {{- .Title }} - {{- if .Draft }}  [Draft]{{- end }} - {{- if .Weight }}  [Pinned]{{- end }} -

-
- {{- if (ne (.Param "hideSummary") true) }} -
- {{ if .Description }} -

{{ .Description | plainify | htmlUnescape }}

- {{ else }} -

{{ .Summary | plainify | htmlUnescape }}{{ if .Truncated }}...{{ end }}

- {{ end }} -
- {{- end }} - {{- if not (.Param "hideMeta") }} -
- {{- partial "post_meta.html" . -}} -
- {{- end }} - -
+
+ {{- range first 5 $pages }} +
+
+ {{- if not .Date.IsZero -}} + {{ .Date | time.Format (default "January 2, 2006" site.Params.DateFormat) }} + {{- end }} +
+
+ {{- .Title }} + {{- if .Draft }}[Draft]{{- end }} + {{- if .Weight }}[Pinned]{{- end }} + +
+
{{ with .Param "issueno" }}#{{ . }}{{ end }}
+
{{- end }} - - {{- if gt $paginator.TotalPages 1 }} - - {{- end }} - - {{- with .Param "archivesSlug" }} - - {{- end }} + +
+ {{- with .Param "archivesSlug" }} + Archives + {{- end }} + {{- with .Param "rssUrl" }} + RSS + {{- end }} +
{{ end }} From cd3b2782659b66af9869a48eceee8493290e698d Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 22:30:07 +0800 Subject: [PATCH 12/28] adjust first-entry ul/ol margin --- assets/css/common/main.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index d1dd1c3..996f267 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -63,6 +63,10 @@ mark { .first-entry .entry-content p { margin-bottom: .8em; } +.first-entry .entry-content ul, +.first-entry .entry-content ol { + margin: .8em 0; +} .first-entry .entry-content li p { margin-bottom: .5em; } From a32112651bf6b1475fc670eadbda323dcc5fff1e Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 22:51:34 +0800 Subject: [PATCH 13/28] finish newsletter section styling --- assets/css/extended/newsletter.scss | 38 ++++++++++++++++++++++++++--- layouts/newsletter/section.html | 4 ++- 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 776463d..1c8677c 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -10,9 +10,27 @@ body.type-newsletter { --signature-bg: rgba(203, 58, 87, 0.239); --signature-bg-dim: rgba(203, 58, 87, 0.147); --main-border: 5px solid var(--signature); - --link-hover-color: var(--signature); --icon-length: 50px; + // override theme-vars + --link-hover-color: var(--signature); + --link-hover-underline-color: var(--signature); + --link-hover-underline-shadow: 0 2px 0 var(--link-hover-underline-color); + + .main { + + a { + font-weight: 500; + color: var(--primary); + box-shadow: var(--link-underline-shadow); + // transition: var(--link-transition); + &:hover { + color: var(--link-hover-color); + box-shadow: var(--link-hover-underline-shadow); + } + } + } + /* shared */ .sub-form { display: flex; @@ -87,14 +105,27 @@ body.type-newsletter.kind-section { .first-entry { margin-bottom: 0; - .entry-header h1 { + .entry-header { text-align: center; + margin-bottom: calc(var(--content-gap) * 1.5); + h1 { + // back to default + font-size: 36px; + } + .subtitle { + color: var(--secondary); + } } // .entry-content { // font-size: 16px; // } } + h2 { + margin: 40px 0 20px; + + } + .list { display: flex; flex-direction: column; @@ -118,8 +149,9 @@ body.type-newsletter.kind-section { a { display: block; width: 100%; + box-shadow: none; } - a:hover, a:active { + a:hover { color: var(--signature); } em { diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 486aa8d..95bbf7d 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -15,6 +15,7 @@ {{- $pages := where .Pages "Params.hidden" "!=" true }} +

最近更新

{{- range first 5 $pages }} @@ -35,9 +36,10 @@ {{- end }}
+

相关链接

{{- with .Param "archivesSlug" }} - Archives + Archives • {{- end }} {{- with .Param "rssUrl" }} RSS From be84faa0d1bec1f416cbce096b3fd26b332646e9 Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 23:31:53 +0800 Subject: [PATCH 14/28] newsletter section page responsive --- assets/css/common/main.css | 14 ++++--- assets/css/extended/newsletter.scss | 59 +++++++++++++++++++++++++---- 2 files changed, 60 insertions(+), 13 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index 996f267..68208dd 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -45,11 +45,6 @@ mark { font-size: 34px; line-height: 1.3; } -@media screen and (max-width: 400px) { - .first-entry .entry-header h1 { - font-size: 30px; - } -} .first-entry .entry-content { margin: 14px 0; @@ -60,6 +55,15 @@ mark { overflow: initial; /* fix edge get cut */ } +@media screen and (max-width: 500px) { + .first-entry .entry-header h1 { + font-size: 30px; + } + .first-entry .entry-content { + font-size: 16px; + } +} + .first-entry .entry-content p { margin-bottom: .8em; } diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 1c8677c..6dda651 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -5,20 +5,29 @@ color candidates: #F20C00 石榴紅 #FF2D51 火紅 */ + +$medium: 960px; +$small: 500px; + body.type-newsletter { --signature: #CB3A56; --signature-bg: rgba(203, 58, 87, 0.239); --signature-bg-dim: rgba(203, 58, 87, 0.147); --main-border: 5px solid var(--signature); --icon-length: 50px; + --icon-font-size: 32px; // override theme-vars --link-hover-color: var(--signature); --link-hover-underline-color: var(--signature); --link-hover-underline-shadow: 0 2px 0 var(--link-hover-underline-color); - .main { + @media screen and (max-width: $small) { + --icon-length: 40px; + --icon-font-size: 24px; + } + .main { a { font-weight: 500; color: var(--primary); @@ -38,9 +47,8 @@ body.type-newsletter { margin: calc(var(--content-gap) * 1.5) 0; form { display: flex; - justify-content: space-between; - align-items: center; line-height: 1.2em; + flex-wrap: wrap; } input { border: 3px solid var(--signature-bg-dim); @@ -49,9 +57,8 @@ body.type-newsletter { appearance: none; outline: none; background-color: var(--theme); + flex-grow: 1; padding: 9px 15px; - max-width: 100%; - width: 100%; transition: var(--link-transition); &:focus { @@ -68,6 +75,15 @@ body.type-newsletter { white-space: nowrap; } } + @media screen and (max-width: $small) { + .sub-form { + button { + margin-left: 0; + margin-top: calc(var(--content-gap)/2); + flex-grow: 1; + } + } + } } body.type-newsletter.kind-section { @@ -79,7 +95,12 @@ body.type-newsletter.kind-section { margin-top: var(--content-gap); padding-bottom: var(--icon-length); min-height: calc(100vh - var(--header-height) - var(--footer-height) - var(--content-gap)); - max-width: calc(var(--nav-width)); + max-width: var(--nav-width); + + @media screen and (max-width: $medium) { + margin-left: var(--gap); + margin-right: var(--gap); + } } .main-icon { @@ -87,12 +108,12 @@ body.type-newsletter.kind-section { left: 0; top: 0; width: var(--icon-length); height: var(--icon-length); - line-height: 45px; + line-height: calc(var(--icon-length) - 3px); border-right: var(--main-border); border-bottom: var(--main-border); background-color: var(--signature); color: var(--theme); - font-size: 32px; + font-size: var(--icon-font-size); text-align: center; } @@ -105,6 +126,10 @@ body.type-newsletter.kind-section { .first-entry { margin-bottom: 0; + @media screen and (max-width: $small) { + margin-top: calc(var(--icon-length)); + } + .entry-header { text-align: center; margin-bottom: calc(var(--content-gap) * 1.5); @@ -168,6 +193,24 @@ body.type-newsletter.kind-section { } } } + @media screen and (max-width: $small) { + .list { + .item { + flex-wrap: wrap; + .date { + flex-grow: 1; + order: 1; + } + .issueno { + order: 2; + } + .title { + order: 3; + flex-grow: 1; + } + } + } + } } } From 462835f1d875be15e786a3fca8fcc48ac7c57f33 Mon Sep 17 00:00:00 2001 From: Reorx Date: Wed, 7 Sep 2022 23:36:41 +0800 Subject: [PATCH 15/28] fixup! finish newsletter section styling --- assets/css/extended/newsletter.scss | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 6dda651..49182bc 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -221,8 +221,9 @@ body.type-newsletter.kind-page { background-color: var(--signature-bg-dim); transition: var(--link-transition); font-size: 32px; - margin-bottom: calc(var(--content-gap) * 2); + // margin-bottom: calc(var(--content-gap) * 2); line-height: var(--icon-length); + box-shadow: none; // reset .icon, .name { height: var(--icon-length); @@ -253,6 +254,7 @@ body.type-newsletter.kind-page { } &:hover, &:active { + box-shadow: none; // reset background-color: var(--signature-bg); .arrow { color: var(--signature); From d9c228117bff094eb3545999364a8533f141467d Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 00:25:50 +0800 Subject: [PATCH 16/28] fix all pages query issues in: list, archives, newsletter section, post_nav_links --- layouts/_default/archives.html | 7 ++++--- layouts/_default/list.html | 1 + layouts/newsletter/section.html | 4 +--- layouts/partials/post_nav_links.html | 9 ++++++++- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index 285b592..dd53699 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -9,12 +9,13 @@ {{- end }}
+{{/* get pages from the current page's section */}} +{{/* in this way, archives.html could be used for section archives other than the only one archives of the whole site */}} {{- $sections := site.Params.mainSections }} -{{/* with the follow condition, archives.html could be used for section archives other than the only one archives of the whole site */}} {{- if .Section }} - {{- $sections = .Section}} + {{- $sections = slice .Section }} {{- end }} -{{- $pages := where site.AllPages "Type" "in" $sections }} +{{- $pages := where (where site.RegularPages "Section" "in" $sections) "Params.hidden" "!=" true }} {{- range $pages.GroupByPublishDate "2006" }} {{- if ne .Key "0001" }} diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 5797a30..67e1897 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -32,6 +32,7 @@ {{- $pages := .Pages }} {{- if .IsHome }} + {{/* get all regular pages instead of pages in a section */}} {{- $pages = where site.RegularPages "Section" "in" site.Params.mainSections }} {{- end }} {{- $pages = where $pages "Params.hidden" "!=" true }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 95bbf7d..a52e40f 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -13,12 +13,10 @@ {{- partial "newsletter_sub_form.html"}} - {{- $pages := where .Pages "Params.hidden" "!=" true }} -

最近更新

- {{- range first 5 $pages }} + {{- range first 5 (where .Pages "Params.hidden" "!=" true) }}
{{- if not .Date.IsZero -}} diff --git a/layouts/partials/post_nav_links.html b/layouts/partials/post_nav_links.html index 2d1eaa9..c52fbfa 100644 --- a/layouts/partials/post_nav_links.html +++ b/layouts/partials/post_nav_links.html @@ -1,4 +1,11 @@ -{{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} +{{/* get pages from the current page's section */}} +{{- $sections := site.Params.mainSections }} +{{- if .Section }} + {{- $sections = slice .Section }} +{{- end }} +{{ $sections }} +{{- $pages := where (where site.RegularPages "Section" "in" $sections) "Params.hidden" "!=" true }} + {{- if and (gt (len $pages) 1) (in $pages . ) }}
{{- end }} - {{- with .Param "archivesSlug" }} -
- Archives +
+ {{- with .Param "archivesSlug" }} + Archives + {{- end }} + {{ with .OutputFormats.Get "rss" -}} + • RSS + {{ end -}}
- {{- end }}
{{- end }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index a52e40f..11d52ab 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -35,13 +35,13 @@

相关链接

-
+
{{- with .Param "archivesSlug" }} - Archives • - {{- end }} - {{- with .Param "rssUrl" }} - RSS + Archives {{- end }} + {{ with .OutputFormats.Get "rss" -}} + • RSS + {{ end -}}
From edf0ed0258cbfffe9bb4d6231601302d2357d24d Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 01:41:33 +0800 Subject: [PATCH 21/28] add newsletter sub box in single --- assets/css/common/post-single.css | 1 + assets/css/extended/newsletter.scss | 18 ++++++++++++++++++ layouts/_default/baseof.html | 2 +- layouts/_default/single.html | 7 ++++++- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index ab0b54f..bdfa945 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -592,6 +592,7 @@ h6:hover .anchor { vertical-align: super; } +/* footnotes */ .footnotes { font-size: .8em; color: var(--primary-dim); diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 55cdbb6..49a7aad 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -285,4 +285,22 @@ body.type-newsletter.kind-page { .post-footer { border-bottom-color: var(--signature); } + + + .newsletter-sub { + margin-top: var(--gap); + background-color: var(--signature-bg-dim); + padding: 1em; + .notice { + font-size: .8em; + color: var(--signature); + line-height: 1.6; + } + .sub-form { + margin: 1em 0; + input { + border-color: var(--signature-bg); + } + } + } } diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html index bf74e92..1413f56 100644 --- a/layouts/_default/baseof.html +++ b/layouts/_default/baseof.html @@ -12,7 +12,7 @@ {{- end -}} {{- if eq site.Params.defaultTheme `dark` -}} {{- print " dark" }} -{{- end }} type-{{ .Type }} kind-{{ .Kind -}} +{{- end }} type-{{ .Type }} kind-{{ .Kind }} layout-{{ .Layout -}} " id="top"> {{- partialCached "header.html" . .Page -}}
diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 6fff034..64fc164 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -54,7 +54,12 @@ {{- end }} {{- if $isNewsletter }} - {{- partial "newsletter_sub_form.html"}} + {{- end }} From 2faf1cc852b794d8d79d1bb7e3ff0e30a4ca4705 Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 02:35:11 +0800 Subject: [PATCH 22/28] finish newsletter archives --- assets/css/extended/newsletter.scss | 34 +++++++++++++---------------- layouts/newsletter/archives.html | 33 ++++++++++++++++++++++++++++ layouts/newsletter/section.html | 7 +++--- 3 files changed, 51 insertions(+), 23 deletions(-) create mode 100644 layouts/newsletter/archives.html diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 49a7aad..136ba92 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -27,8 +27,9 @@ body.type-newsletter { --icon-font-size: 24px; } - /* a links in section page content and regular page post-content */ + /* a links in section/archives page content and regular page post-content */ &.kind-section .main .content a, + &.layout-archives .main .content a, &.kind-page .post-content a { font-weight: 500; color: var(--primary); @@ -86,8 +87,9 @@ body.type-newsletter { } } -body.type-newsletter.kind-section { - /* section page layout */ +body.type-newsletter.kind-section, +body.type-newsletter.layout-archives { + /* section/archives page */ .main { border: var(--main-border); @@ -129,21 +131,16 @@ body.type-newsletter.kind-section { @media screen and (max-width: $small) { margin-top: calc(var(--icon-length)); } + } - .entry-header { - text-align: center; - margin-bottom: calc(var(--content-gap) * 1.5); - h1 { - // back to default - font-size: 36px; - } - .subtitle { - color: var(--secondary); - } - } - // .entry-content { - // font-size: 16px; - // } + h1 { + text-align: center; + margin-top: var(--gap); + margin-bottom: calc(var(--content-gap) * 1); + } + .subtitle { + text-align: center; + color: var(--secondary); } h2 { @@ -214,7 +211,7 @@ body.type-newsletter.kind-section { } } -/* regular page layout */ +/* regular page */ body.type-newsletter.kind-page { .newsletter-brand { --icon-length: 50px; @@ -286,7 +283,6 @@ body.type-newsletter.kind-page { border-bottom-color: var(--signature); } - .newsletter-sub { margin-top: var(--gap); background-color: var(--signature-bg-dim); diff --git a/layouts/newsletter/archives.html b/layouts/newsletter/archives.html new file mode 100644 index 0000000..ae19b5a --- /dev/null +++ b/layouts/newsletter/archives.html @@ -0,0 +1,33 @@ +{{- define "main" }} +
＠
+ +
+

{{ .Title }}

+ {{- partial "newsletter_sub_form.html"}} + + {{/* get pages from the current page's section */}} + {{- $sections := slice .Section }} + {{- $pages := where (where site.RegularPages "Section" "in" $sections) "Params.hidden" "!=" true }} + + {{/* TODO statistics */}} +
+ {{- range $pages }} +
+
+ {{- if not .Date.IsZero -}} + {{ .Date | time.Format (default "January 2, 2006" site.Params.DateFormat) }} + {{- end }} +
+
+ {{- .Title }} + {{- if .Draft }}[Draft]{{- end }} + {{- if .Weight }}[Pinned]{{- end }} + +
+
{{ with .Param "issueno" }}#{{ . }}{{ end }}
+
+ {{- end }} +
+ +
+{{ end }} diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 11d52ab..28ac710 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -4,11 +4,10 @@
＠
+

{{ .Title }}

+ {{ with .Param "subtitle" }}
{{ . }}
{{ end }} +
-
-

{{ .Title }}

- {{ with .Param "subtitle" }}
{{ . }}
{{ end }} -
{{ .Description | markdownify }}
{{- partial "newsletter_sub_form.html"}}
From deb675dacea8df81c0c3d027322e8d486d6b52e6 Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 02:37:44 +0800 Subject: [PATCH 23/28] clear debug code --- layouts/partials/post_nav_links.html | 1 - 1 file changed, 1 deletion(-) diff --git a/layouts/partials/post_nav_links.html b/layouts/partials/post_nav_links.html index c52fbfa..05e68a3 100644 --- a/layouts/partials/post_nav_links.html +++ b/layouts/partials/post_nav_links.html @@ -3,7 +3,6 @@ {{- if .Section }} {{- $sections = slice .Section }} {{- end }} -{{ $sections }} {{- $pages := where (where site.RegularPages "Section" "in" $sections) "Params.hidden" "!=" true }} {{- if and (gt (len $pages) 1) (in $pages . ) }} From e14673bee7e16f4c00a5ad50d62f1aa023ff11ac Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 21:08:03 +0800 Subject: [PATCH 24/28] subtle adjustments --- assets/css/common/post-single.css | 5 ++++- assets/css/extended/newsletter.scss | 6 +----- layouts/_default/single.html | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index bdfa945..2f6e2c1 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -1,6 +1,9 @@ .page-header, .post-header { - margin: 32px 0; + margin: calc(var(--gap) * 4/3) 0; +} +.post-header { + margin-top: calc(var(--gap) * 1/3); } .post-title { diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 136ba92..7ac207b 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -127,10 +127,6 @@ body.type-newsletter.layout-archives { .first-entry { margin-bottom: 0; - - @media screen and (max-width: $small) { - margin-top: calc(var(--icon-length)); - } } h1 { @@ -284,7 +280,7 @@ body.type-newsletter.kind-page { } .newsletter-sub { - margin-top: var(--gap); + margin-top: calc(var(--content-gap) * 1.5); background-color: var(--signature-bg-dim); padding: 1em; .notice { diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 64fc164..fa4c86d 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -56,7 +56,7 @@ {{- if $isNewsletter }} From ce83fcc8ed84127f21b328b759882409093dcf67 Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 21:29:29 +0800 Subject: [PATCH 25/28] consistant header gaps --- assets/css/common/main.css | 14 ++++++++++++-- assets/css/common/post-single.css | 8 ++------ assets/css/extended/newsletter.scss | 12 +++++++----- 3 files changed, 21 insertions(+), 13 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index 785546c..8d798f5 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -4,8 +4,18 @@ min-height: calc(100vh - var(--header-height) - var(--footer-height)); max-width: calc(var(--main-width) + var(--gap) * 2); margin: auto; - padding: var(--gap); - padding-bottom: 0; + padding: var(--content-gap) var(--gap) 0; +} + +@media screen and (max-width: 500px) { + .main { + padding-top: 0; + } +} + +/* same as .post-header */ +.page-header { + margin: var(--gap) 0 calc(var(--content-gap) * 1.5); } .mark-line { diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index 2f6e2c1..03104b6 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -1,14 +1,10 @@ -.page-header, .post-header { - margin: calc(var(--gap) * 4/3) 0; -} -.post-header { - margin-top: calc(var(--gap) * 1/3); + margin: var(--gap) 0 calc(var(--content-gap) * 1.5); } .post-title { font-size: 40px; - margin: var(--content-gap) 0; + margin-bottom: var(--content-gap); } .post-description { diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 7ac207b..97bfa9c 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -94,7 +94,8 @@ body.type-newsletter.layout-archives { .main { border: var(--main-border); background-color: var(--theme); - margin-top: var(--content-gap); + margin-top: var(--gap); + padding-top: 0; padding-bottom: var(--icon-length); min-height: calc(100vh - var(--header-height) - var(--footer-height) - var(--content-gap)); max-width: var(--nav-width); @@ -122,7 +123,7 @@ body.type-newsletter.layout-archives { .main { .content { max-width: calc(var(--post-width)); - margin: 0 auto; + margin: var(--icon-length) auto 0; } .first-entry { @@ -131,12 +132,13 @@ body.type-newsletter.layout-archives { h1 { text-align: center; - margin-top: var(--gap); - margin-bottom: calc(var(--content-gap) * 1); + margin-bottom: 10px; } .subtitle { text-align: center; color: var(--secondary); + line-height: 1.2em; + margin-bottom: var(--content-gap); } h2 { @@ -216,7 +218,7 @@ body.type-newsletter.kind-page { background-color: var(--signature-bg-dim); transition: var(--link-transition); font-size: 32px; - // margin-bottom: calc(var(--content-gap) * 2); + margin-bottom: var(--content-gap); line-height: var(--icon-length); box-shadow: none; // reset From e4f4f1d6608cee4997f5ee67a486424ade29c6b6 Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 21:46:44 +0800 Subject: [PATCH 26/28] use content-gap instead of gap for header --- assets/css/common/main.css | 2 +- assets/css/common/post-single.css | 2 +- assets/css/extended/newsletter.scss | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/assets/css/common/main.css b/assets/css/common/main.css index 8d798f5..893081f 100644 --- a/assets/css/common/main.css +++ b/assets/css/common/main.css @@ -15,7 +15,7 @@ /* same as .post-header */ .page-header { - margin: var(--gap) 0 calc(var(--content-gap) * 1.5); + margin: var(--content-gap) 0 calc(var(--content-gap) * 1.5); } .mark-line { diff --git a/assets/css/common/post-single.css b/assets/css/common/post-single.css index 03104b6..7095192 100644 --- a/assets/css/common/post-single.css +++ b/assets/css/common/post-single.css @@ -1,5 +1,5 @@ .post-header { - margin: var(--gap) 0 calc(var(--content-gap) * 1.5); + margin: var(--content-gap) 0 calc(var(--content-gap) * 1.5); } .post-title { diff --git a/assets/css/extended/newsletter.scss b/assets/css/extended/newsletter.scss index 97bfa9c..a1a8fef 100644 --- a/assets/css/extended/newsletter.scss +++ b/assets/css/extended/newsletter.scss @@ -94,7 +94,7 @@ body.type-newsletter.layout-archives { .main { border: var(--main-border); background-color: var(--theme); - margin-top: var(--gap); + margin-top: var(--content-gap); padding-top: 0; padding-bottom: var(--icon-length); min-height: calc(100vh - var(--header-height) - var(--footer-height) - var(--content-gap)); From 3f294daccf50f2242a085fd9af97d115a9d96d32 Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 21:50:49 +0800 Subject: [PATCH 27/28] lower nav height in mobile --- assets/css/core/theme-vars.css | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/css/core/theme-vars.css b/assets/css/core/theme-vars.css index e3dd503..d67a361 100644 --- a/assets/css/core/theme-vars.css +++ b/assets/css/core/theme-vars.css @@ -27,6 +27,12 @@ --link-transition: all 0.3s ease; --line-yellow: url("data:image/svg+xml;charset=utf-8,%3Csvg preserveAspectRatio='none' width='120' height='6' viewBox='0 0 120 6' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M119 0.8C60 4 50-0.5 1 1.5' stroke='%23fc0' stroke-width='3' fill='none' stroke-linecap='round'/%3E%3C/svg%3E"); } +@media screen and (max-width: 500px) { + :root { + --header-height: 52px; + } + +} .dark { --theme: rgb(29, 30, 32); From bb02a60990dd79f9828798a044776984d51ff5da Mon Sep 17 00:00:00 2001 From: Reorx Date: Thu, 8 Sep 2022 21:55:35 +0800 Subject: [PATCH 28/28] newsletter section: only show list when there are pages --- layouts/newsletter/section.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/layouts/newsletter/section.html b/layouts/newsletter/section.html index 28ac710..04c3eed 100644 --- a/layouts/newsletter/section.html +++ b/layouts/newsletter/section.html @@ -12,10 +12,12 @@ {{- partial "newsletter_sub_form.html"}}
-

最近更新

+ {{ $pages := where .Pages "Params.hidden" "!=" true }} + {{ if $pages }} +

最新通讯

- {{- range first 5 (where .Pages "Params.hidden" "!=" true) }} + {{- range first 5 $pages }}
{{- if not .Date.IsZero -}} @@ -32,6 +34,7 @@
{{- end }}
+ {{ end }}

相关链接