diff --git a/Illustration-after.png b/Illustration-after.png new file mode 100644 index 0000000..8ded93d Binary files /dev/null and b/Illustration-after.png differ diff --git a/Illustration-before.png b/Illustration-before.png new file mode 100644 index 0000000..8a09ba8 Binary files /dev/null and b/Illustration-before.png differ diff --git a/layouts/_default/archives.html b/layouts/_default/archives.html index e400e2c..c0b8fc1 100644 --- a/layouts/_default/archives.html +++ b/layouts/_default/archives.html @@ -1,5 +1,6 @@ {{- define "main" }} +

{{ .Title }}

{{- if .Description }} @@ -11,7 +12,7 @@ {{- $pages := where site.RegularPages "Type" "in" site.Params.mainSections }} -{{- if site.Params.ShowAllPagesInArchive }} +{{- if .Site.Params.ShowAllPagesInArchive }} {{- $pages = site.RegularPages }} {{- end }} @@ -27,16 +28,23 @@
{{- range .Pages }} {{- if eq .Kind "page" }} -
-

- {{- .Title | markdownify }} - {{- if .Draft }}  [draft]{{- end }} -

-
- {{- partial "post_meta.html" . -}} +
+ {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden }} + {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden "Isarchives" true) }} +
+ +

+ + {{- .Title | markdownify }} + {{- if .Draft }}  [draft]{{- end }} +

+
+ {{- partial "post_meta.html" . -}} +
+
-
+ {{- end }} {{- end }}
diff --git a/layouts/_default/list.html b/layouts/_default/list.html index f4ff6ec..2a6bf85 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -1,10 +1,13 @@ {{- define "main" }} -{{- if (and site.Params.profileMode.enabled .IsHome) }} +{{- if (and .Site.Params.profileMode.enabled .IsHome) }} {{- partial "index_profile.html" . }} {{- else }} {{/* if not profileMode */}} {{- if not .IsHome | and .Title }} + + +
{{- partial "breadcrumbs.html" . }}

{{ .Title }}

@@ -16,12 +19,15 @@
{{- end }} + + {{- if .Content }}
{{- if not (.Param "disableAnchoredHeadings") }} {{- partial "anchored_headings.html" .Content -}} {{- else }}{{ .Content }}{{ end }}
+ {{- end }} {{- $pages := union .RegularPages .Sections }} @@ -30,40 +36,86 @@ {{- $pages = where site.RegularPages "Type" "in" site.Params.mainSections }} {{- end }} + + + {{- $paginator := .Paginate $pages }} -{{- if and .IsHome site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} +{{- if and .IsHome .Site.Params.homeInfoParams (eq $paginator.PageNumber 1) }} + {{- partial "home_info.html" . }} + {{- end }} + {{- $term := .Data.Term }} {{- range $index, $page := $paginator.Pages }} {{- $class := "post-entry" }} -{{- $user_preferred := or site.Params.disableSpecial1stPost site.Params.homeInfoParams }} + + +{{- $user_preferred := or .Site.Params.disableSpecial1stPost .Site.Params.homeInfoParams }} {{- if (and $.IsHome (eq $paginator.PageNumber 1) (eq $index 0) (not $user_preferred)) }} {{- $class = "first-entry" }} {{- else if $term }} {{- $class = "post-entry tag-entry" }} + {{- end }} + + + + + +
- {{- $isHidden := (site.Params.cover.hidden | default site.Params.cover.hiddenInList) }} - {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} -
-

- {{- .Title }} - {{- if .Draft }}  [draft]{{- end }} -

-
+
+
+ {{- $isHidden := (.Site.Params.cover.hidden | default .Site.Params.cover.hiddenInList) }} + {{- partial "cover.html" (dict "cxt" . "IsHome" true "isHidden" $isHidden) }} +
+ + + +
+
+

+ {{- .Title }} + {{- if .Draft }}  [draft]{{- end }} +

+
+
+

{{- if .Description }}{{- .Description }}{{- end }}

+

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

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

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

-
+ {{- end }} {{- if not (.Param "hideMeta") }}
+ {{- partial "post_meta.html" . -}}
{{- end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index d313500..7073e43 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -1,28 +1,155 @@ {{- define "main" }} + + + +{{- if (.Param "isapage")}}
-
- {{ partial "breadcrumbs.html" . }} -

- {{ .Title }} - {{- if .Draft }}  [draft]{{- end }} -

- {{- if .Description }} -
- {{ .Description }} -
+
+ + +
+ {{ partial "breadcrumbs.html" . }} +

+ {{ .Title }} + {{- if .Draft }}  [draft]{{- end }} +

+ {{- if .Description }} +
+ {{ .Description }} +
+ {{- end }} + {{- if not (.Param "hideMeta") }} + {{- if (.Param "ShowToc") }} + {{- partial "toc.html" . }} {{- end }} - {{- if not (.Param "hideMeta") }} -
- {{- partial "post_meta.html" . -}} - {{- partial "translation_list.html" . -}} - {{- partial "edit_post.html" . -}} - {{- partial "post_canonical.html" . -}} -
+
+ {{- partial "post_meta.html" . -}} + {{- partial "translation_list.html" . -}} + {{- partial "edit_post.html" . -}} + {{- partial "post_canonical.html" . -}} +
+ {{- end }} +
+
+ + + + {{- if (.Param "ShowToc") }} + {{- partial "toc.html" . }} + {{- end }} + + + {{- if .Description }} +
+ {{ .Description }} +
+ {{- end }} + + + + {{- if (.Param "curriculum") }} + + + + + {{- if not (.Param "english") }} + + {{- else }} + {{- end }} -
- {{- $isHidden := .Params.cover.hidden | default site.Params.cover.hiddenInSingle | default site.Params.cover.hidden }} - {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} + + + {{- end }} + + {{- if .Content }} +
+ {{- if not (.Param "disableAnchoredHeadings") }} + {{- partial "anchored_headings.html" .Content -}} + {{- else }}{{ .Content }}{{ end }} +
+ {{- end }} + +
+ {{- if .Params.tags }} + + {{- end }} + {{- if (.Param "ShowPostNavLinks") }} + {{- partial "post_nav_links.html" . }} + {{- end }} + {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true)) }} + {{- partial "share_icons.html" . -}} + {{- end }} +
+ + {{- if (.Param "comments") }} + {{- partial "comments.html" . }} + {{- end }} +
+{{- end }} + +{{- if not (.Param "isapage") }} +
+
+
+ {{- $isHidden := .Params.cover.hidden | default .Site.Params.cover.hiddenInSingle | default .Site.Params.cover.hidden }} + {{- partial "cover.html" (dict "cxt" . "IsHome" false "isHidden" $isHidden) }} +
+ +
+ {{ partial "breadcrumbs.html" . }} +

+ {{ .Title | markdownify}} + {{- if .Draft }}  [draft]{{- end }} +

+ {{- if .Description }} +
+ {{ .Description }} +
+ {{- end }} + {{- if not (.Param "hideMeta") }} +
+ {{- partial "post_meta.html" . -}} +
+
+ {{- partial "translation_list.html" . -}} + {{- partial "edit_post.html" . -}} + {{- partial "post_canonical.html" . -}} +
+ {{- end }} +
+
+ + + + {{- if (.Param "ShowToc") }} {{- partial "toc.html" . }} {{- end }} @@ -46,7 +173,7 @@ {{- if (.Param "ShowPostNavLinks") }} {{- partial "post_nav_links.html" . }} {{- end }} - {{- if (and site.Params.ShowShareButtons (ne .Params.disableShare true)) }} + {{- if (and .Site.Params.ShowShareButtons (ne .Params.disableShare true)) }} {{- partial "share_icons.html" . -}} {{- end }} @@ -55,5 +182,6 @@ {{- partial "comments.html" . }} {{- end }}
+{{- end }} {{- end }}{{/* end main */}} diff --git a/layouts/partials/cover.html b/layouts/partials/cover.html index 5c5f2fb..e03747a 100644 --- a/layouts/partials/cover.html +++ b/layouts/partials/cover.html @@ -1,9 +1,23 @@ {{- with .cxt}} {{/* Apply proper context from dict */}} {{- if (and .Params.cover.image (not $.isHidden)) }} {{- $alt := (.Params.cover.alt | default .Params.cover.caption | plainify) }} -
- {{- $responsiveImages := (.Params.cover.responsiveImages | default site.Params.cover.responsiveImages) | default true }} - {{- $addLink := (and site.Params.cover.linkFullImages (not $.IsHome)) }} + +{{- if $.Isarchives }} + +{{- end }} + +
+ + {{- $responsiveImages := (.Params.cover.responsiveImages | default .Site.Params.cover.responsiveImages) | default true }} + {{- $addLink := (and .Site.Params.cover.linkFullImages (not $.IsHome)) }} {{- $cover := (.Resources.ByType "image").GetMatch (printf "*%s*" (.Params.cover.image)) }} {{- if $cover -}}{{/* i.e it is present in page bundle */}} {{- if $addLink }}

{{ .Title | markdownify }}

@@ -10,4 +27,4 @@ {{ partial "social_icons.html" site.Params.socialIcons }}
-{{- end -}} +{{- end -}} \ No newline at end of file