Skip to content

Fix for breaking changes to partials #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plrichardson wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Fix for breaking changes to partials #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b3078d6
Strip partials/ from paths
plrichardson Jan 11, 2026
0517f18
move partials to _partials and strip partials/ from path
plrichardson Jan 11, 2026
0140f73
move partials to _partials
plrichardson Jan 11, 2026
ceb52f1
Remove partials
plrichardson Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion layouts/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{- define "content" -}}
Expand Down
8 changes: 4 additions & 4 deletions layouts/_default/baseof.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<!DOCTYPE html>
<html lang="{{ .Site.LanguageCode }}">
{{- partial "partials/shared/head.html" . -}}
{{- partial "shared/head.html" . -}}
<body>
<div id="main-content" class="bg-color-gray">
{{- partial "partials/shared/logo-and-navigation.html" . -}}
{{- partial "shared/logo-and-navigation.html" . -}}
<div class="page-container scene-main scene-main--fade_In">
{{- block "photomosaic" . }}{{- end }}
{{- block "content" . }}{{- end }}
</div>
{{- partial "partials/shared/footer.html" . -}}
{{- partial "shared/footer.html" . -}}
</div>
{{- partial "partials/shared/js.html" . -}}
{{- partial "shared/js.html" . -}}
</body>
</html>
2 changes: 1 addition & 1 deletion layouts/_default/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{ define "content"}}
Expand Down
10 changes: 5 additions & 5 deletions layouts/_default/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{ define "content"}}
Expand All @@ -18,9 +18,9 @@
{{- if and (eq $titleGalleryLen 0) (eq $coverImageLen 0) -}}{{- $topRadius = " post_text_top_radius" -}}{{- end -}}
<div class="post_text{{ $topRadius }}">
<div class="post_meta_top">
{{- partial "partials/shared/links-to-translations.html" . .Page -}}
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/links-to-translations.html" . .Page -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h1 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></h1>
<div class="post_content padding_bottom">
Expand All @@ -34,7 +34,7 @@ <h1 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></
</div>
</article>
</div>
{{- partial "partials/remark42/comments.html" . -}}
{{- partial "remark42/comments.html" . -}}
</div>
</div>
</div>
Expand Down
0 layouts/partials/_funcs/get-page-images.html → ...uts/_partials/_funcs/get-page-images.html
View file
Open in desktop
File renamed without changes.
0 ...ts/partials/embedded-gallery-partial.html → ...s/_partials/embedded-gallery-partial.html
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions layouts/partials/list/full-width-blog.html → layouts/_partials/list/full-width-blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
{{- if and (eq $titleGalleryLen 0) (eq $coverImageLen 0) -}}{{- $topRadius = " post_text_top_radius" -}}{{- end -}}
<div class="post_text{{ $topRadius }}">
<div class="post_meta_top">
{{- partial "partials/shared/links-to-translations.html" . .Page -}}
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/links-to-translations.html" . .Page -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h1 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></h1>
<div class="post_content{{ if not .Truncated }} padding_bottom{{ end }}">
Expand Down
4 changes: 2 additions & 2 deletions ...uts/partials/list/full-width-gallery.html → ...ts/_partials/list/full-width-gallery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
<article>
<div class="post_text post_text_top_radius">
<div class="post_meta_top">
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h1 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></h1>

Expand Down
6 changes: 3 additions & 3 deletions layouts/partials/list/full-width-note.html → layouts/_partials/list/full-width-note.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
{{- if and (eq $titleGalleryLen 0) (eq $coverImageLen 0) -}}{{- $topRadius = " post_text_top_radius" -}}{{- end -}}
<div class="post_text{{ $topRadius }} note">
<div class="post_meta_top">
{{- partial "partials/shared/links-to-translations.html" . .Page -}}
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/links-to-translations.html" . .Page -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h1 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></h1>
<div class="post_content{{ if not .Truncated }} padding_bottom{{ end }}">
Expand Down
9 changes: 9 additions & 0 deletions layouts/_partials/list/full-width-post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{{- if eq .Page.Type "gallery" -}}
{{- partial "list/full-width-gallery.html" . -}}
{{- else if eq .Page.Type "note" -}}
{{- partial "list/full-width-note.html" . -}}
{{- else if eq .Page.Type "story" -}}
{{- partial "list/full-width-story.html" . -}}
{{- else -}}
{{- partial "list/full-width-blog.html" . -}}
{{- end -}}
0 layouts/partials/list/full-width-story.html → layouts/_partials/list/full-width-story.html
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...s/partials/list/one-third-width-blog.html → .../_partials/list/one-third-width-blog.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
{{ partial "shared/post-title-image-or-gallery.html" . }}
<div class="post_text">
<div class="post_meta_top">
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h1 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></h1>
<div class="post_content">
Expand Down
4 changes: 2 additions & 2 deletions ...artials/list/one-third-width-gallery.html → ...artials/list/one-third-width-gallery.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
</div>
<div class="post_text">
<div class="post_meta_top">
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h4 class="post_title"><a href="{{- .RelPermalink | relURL -}}">{{- .Title -}}</a></h4>
<div class="post_nav"><a href="{{- .RelPermalink | relURL -}}" class="link-arrow">{{- i18n "fullGallery" -}} ➠</a></div>
Expand Down
5 changes: 5 additions & 0 deletions layouts/_partials/list/one-third-width-post.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{{- if eq .Page.Type "gallery" -}}
{{- partial "list/one-third-width-gallery.html" . -}}
{{- else -}}
{{- partial "list/one-third-width-blog.html" . -}}
{{- end -}}
0 layouts/partials/remark42/comments.html → layouts/_partials/remark42/comments.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/shared/date.html → layouts/_partials/shared/date.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/shared/footer.html → layouts/_partials/shared/footer.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/shared/ga.html → layouts/_partials/shared/ga.html
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion layouts/partials/shared/head.html → layouts/_partials/shared/head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
{{ with .Site.Params.meta.keywords }}<meta name="keywords" content="{{ . }}">{{ end }}
{{ with .Site.Params.canonicalURL }}<link rel="canonical" href="{{ . }}{{ $.Page.RelPermalink | relURL }}">{{ end }}

{{- partial "partials/shared/opengraph.html" . -}}
{{- partial "shared/opengraph.html" . -}}

{{- $booststrap := resources.Get "/css/bootstrap.min.css" | resources.Fingerprint -}}
{{- $themeModules := resources.Get "/css/theme-modules.css" | resources.Fingerprint -}}
Expand Down
0 layouts/partials/shared/js.html → layouts/_partials/shared/js.html
View file
Open in desktop
File renamed without changes.
0 ...artials/shared/links-to-translations.html → ...artials/shared/links-to-translations.html
View file
Open in desktop
File renamed without changes.
0 .../partials/shared/logo-and-navigation.html → ..._partials/shared/logo-and-navigation.html
View file
Open in desktop
File renamed without changes.
10 changes: 9 additions & 1 deletion layouts/partials/shared/opengraph.html → layouts/_partials/shared/opengraph.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<meta property="og:type" content="{{ if .IsPage }}article{{ else }}website{{ end }}" />
<meta property="og:url" content="{{ .Permalink }}" />

{{- $images := partial "partials/_funcs/get-page-images" . -}}
{{- $images := partial "_funcs/get-page-images" . -}}
{{- range first 6 $images -}}
<meta property="og:image" content="{{ .Permalink }}" />
{{- end -}}
Expand Down Expand Up @@ -55,6 +55,14 @@
{{- if reflect.IsMap . }}
{{- $facebookAdmin = .facebook_admin }}
{{- end }}
<<<<<<< Updated upstream:layouts/partials/shared/opengraph.html
=======
{{- else }}
{{- with site.Params.Social.facebook_admin }}
{{- $facebookAdmin = . }}
{{- warnf "The social key in site configuration is deprecated. Use params.social.facebook_admin instead." }}
{{- end }}
>>>>>>> Stashed changes:layouts/_partials/shared/opengraph.html
{{- end }}

{{- /* Facebook Page Admin ID for Domain Insights */}}
Expand Down
0 ...uts/partials/shared/photomosaic-data.html → ...ts/_partials/shared/photomosaic-data.html
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...uts/partials/shared/photomosaic-impl.html → ...ts/_partials/shared/photomosaic-impl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{{- $photomosiacData := (partialCached "partials/shared/photomosaic-data.html" . ) -}}
{{- $photomosiacData := (partialCached "shared/photomosaic-data.html" . ) -}}
{{- $randomPhotos := slice -}}
{{- range $index, $unused := $photomosiacData -}}
{{- $randomPhotos = $randomPhotos | append $index -}}
Expand Down
2 changes: 1 addition & 1 deletion layouts/partials/shared/photomosaic.html → layouts/_partials/shared/photomosaic.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ <h3>{{ i18n "stories" }}</h3>
{{- $seq := seq .Site.Params.photomosaic.numberOfUniqueMosaics -}}
{{- $seq = shuffle $seq -}}
{{- $cacheId := first 1 $seq -}}
{{- partialCached "partials/shared/photomosaic-impl.html" . $cacheId -}}
{{- partialCached "shared/photomosaic-impl.html" . $cacheId -}}
</div>
0 ...s/shared/post-title-image-or-gallery.html → ...s/shared/post-title-image-or-gallery.html
View file
Open in desktop
File renamed without changes.
0 layouts/partials/shared/tags.html → layouts/_partials/shared/tags.html
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion layouts/gallery/list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{- define "content" -}}
Expand Down
8 changes: 4 additions & 4 deletions layouts/gallery/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{- define "content" -}}
Expand Down Expand Up @@ -29,8 +29,8 @@
<article>
<div class="post_text padding_bottom post_text_top_radius">
<div class="post_meta_top">
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
<h4 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></h4>

Expand Down Expand Up @@ -76,7 +76,7 @@ <h4 class="post_title"><a href="{{ .RelPermalink | relURL }}">{{ .Title }}</a></
</div>
</article>
</div>
{{- partial "partials/remark42/comments.html" . -}}
{{- partial "remark42/comments.html" . -}}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion layouts/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{- define "content" -}}
Expand Down
9 changes: 0 additions & 9 deletions layouts/partials/list/full-width-post.html
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions layouts/partials/list/one-third-width-post.html
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions layouts/story/single.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- define "photomosaic" -}}
{{- partial "partials/shared/photomosaic.html" . -}}
{{- partial "shared/photomosaic.html" . -}}
{{- end -}}

{{- define "content" -}}
Expand Down Expand Up @@ -78,12 +78,12 @@
{{- if .Title -}}<div class="story-title"><h1 class="story_title">{{ .Title }}</h1></div>{{- end -}}
</div>
<div class="post_text post_meta_top">
{{- partial "partials/shared/tags.html" . -}}
{{- partial "partials/shared/date.html" . -}}
{{- partial "shared/tags.html" . -}}
{{- partial "shared/date.html" . -}}
</div>
</article>
</div>
{{- partial "partials/remark42/comments.html" . -}}
{{- partial "remark42/comments.html" . -}}
</div>
</div>
</div>
Expand Down