diff --git a/content/albums/pets.md b/content/albums/pets.md index 26f7fce5..760c4d2b 100644 --- a/content/albums/pets.md +++ b/content/albums/pets.md @@ -10,6 +10,11 @@ "Caption": "Yellow lab running through snow that is up to his body", "Latitude": "", "Longitude": "", + "Camera": "Canon EOS REBEL T3", + "Lens": "EF-S18-55mm f/3.5-5.6 IS II", + "FocalLength": "47", + "fStop": "11", + "DateTimeOriginal": "2016-12-30T10:46:24-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-01-2160.jpg", @@ -38,6 +43,11 @@ "Caption": "Yellow lab in a snow bank with just his head sticking up", "Latitude": "", "Longitude": "", + "Camera": "Canon EOS REBEL T3", + "Lens": "EF-S18-55mm f/3.5-5.6 IS II", + "FocalLength": "48", + "fStop": "13", + "DateTimeOriginal": "2016-12-30T10:48:04-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-02-2160.jpg", @@ -66,6 +76,11 @@ "Caption": "Grey cat with big wide eyes sitting in a basket", "Latitude": "", "Longitude": "", + "Camera": "Canon EOS REBEL T3", + "Lens": "EF50mm f/1.8 STM", + "FocalLength": "", + "fStop": "1.8", + "DateTimeOriginal": "2018-10-06T20:14:33-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-03-2160.jpg", @@ -94,6 +109,11 @@ "Caption": "Yellow lab lying on a bed, head on a green pillow", "Latitude": "", "Longitude": "", + "Camera": "Canon EOS REBEL T3", + "Lens": "EF50mm f/1.8 STM", + "FocalLength": "", + "fStop": "1.8", + "DateTimeOriginal": "2018-10-08T09:31:13-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-04-2160.jpg", @@ -122,6 +142,11 @@ "Caption": "Yellow lab standing amongst yellow and orange leaves", "Latitude": "", "Longitude": "", + "Camera": "Canon EOS REBEL T3", + "Lens": "EF50mm f/1.8 STM", + "FocalLength": "", + "fStop": "2.8", + "DateTimeOriginal": "2019-10-26T13:14:20-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-05-2160.jpg", @@ -150,6 +175,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "Apple iPhone 11 Pro", + "Lens": "Apple iPhone 11 Pro back triple camera 4.25mm f/1.8", + "FocalLength": "", + "fStop": "1.8", + "DateTimeOriginal": "2020-08-07T21:22:03-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-06-2160.jpg", @@ -174,10 +204,15 @@ ] }, { - "Title": "", + "Title": "Pets-07", "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T30", + "Lens": "FUJIFILM XF35mm F2 R WR", + "FocalLength": "", + "fStop": "3.6", + "DateTimeOriginal": "2020-10-17T13:50:47-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-07-2160.jpg", @@ -206,6 +241,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T30", + "Lens": "FUJIFILM XF35mm F2 R WR", + "FocalLength": "", + "fStop": "4.5", + "DateTimeOriginal": "2022-07-30T22:12:16-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-08-2160.jpg", @@ -234,6 +274,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T30", + "Lens": "FUJIFILM XF35mm F2 R WR", + "FocalLength": "", + "fStop": "4", + "DateTimeOriginal": "2022-07-30T22:18:29-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-09-2160.jpg", @@ -262,6 +307,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T30", + "Lens": "FUJIFILM XF35mm F2 R WR", + "FocalLength": "", + "fStop": "2", + "DateTimeOriginal": "2022-07-30T22:35:26-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-10-2160.jpg", @@ -290,6 +340,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "FUJIFILM XF18-55mm F2.8-4 R LM OIS", + "FocalLength": "55", + "fStop": "4", + "DateTimeOriginal": "2023-06-11T15:02:24-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-11-2160.jpg", @@ -318,6 +373,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "21.0 mm", + "FocalLength": "", + "fStop": "1", + "DateTimeOriginal": "2023-07-12T18:02:21-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-12-2160.jpg", @@ -346,6 +406,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "FUJIFILM XF35mm F2 R WR", + "FocalLength": "", + "fStop": "4.5", + "DateTimeOriginal": "2023-07-12T18:33:06-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-13-2160.jpg", @@ -374,6 +439,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "21.0 mm", + "FocalLength": "", + "fStop": "1", + "DateTimeOriginal": "2023-07-12T23:30:19+01:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-14-2160.jpg", @@ -402,6 +472,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "FUJIFILM XF35mm F2 R WR", + "FocalLength": "", + "fStop": "2", + "DateTimeOriginal": "2023-09-01T06:43:42-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-15-2160.jpg", @@ -430,6 +505,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "FUJIFILM XF18-55mm F2.8-4 R LM OIS", + "FocalLength": "55", + "fStop": "20", + "DateTimeOriginal": "2023-10-18T11:43:52-07:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-16-2160.jpg", @@ -458,6 +538,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "21.0 mm", + "FocalLength": "", + "fStop": "1", + "DateTimeOriginal": "2023-12-02T17:29:35-04:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-17-2160.jpg", @@ -486,6 +571,11 @@ "Caption": "", "Latitude": "", "Longitude": "", + "Camera": "FUJIFILM X-T5", + "Lens": "21.0 mm", + "FocalLength": "", + "fStop": "1", + "DateTimeOriginal": "2023-12-02T17:35:23-04:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/pets/pets-18-2160.jpg", @@ -510,5 +600,7 @@ ] } ] + + } --- diff --git a/content/albums/seattle-night-workshop.md b/content/albums/seattle-night-workshop.md index 0e2a4e39..e898c940 100644 --- a/content/albums/seattle-night-workshop.md +++ b/content/albums/seattle-night-workshop.md @@ -14,6 +14,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "16", + "DateTimeOriginal": "2024-03-09T17:49:03-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-01-2160.jpg", @@ -46,6 +47,7 @@ "Lens": "21.0 mm", "FocalLength": "", "fStop": "1", + "DateTimeOriginal": "2024-03-09T18:00:09-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-02-2160.jpg", @@ -78,6 +80,7 @@ "Lens": "21.0 mm", "FocalLength": "", "fStop": "1", + "DateTimeOriginal": "2024-03-09T18:00:36-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-03-2160.jpg", @@ -110,6 +113,7 @@ "Lens": "FUJIFILM XF35mm F2 R WR", "FocalLength": "", "fStop": "2.5", + "DateTimeOriginal": "2024-03-09T18:12:12-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-04-2160.jpg", @@ -142,6 +146,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "16", + "DateTimeOriginal": "2024-03-09T18:18:30-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-05-2160.jpg", @@ -174,6 +179,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "3.2", + "DateTimeOriginal": "2024-03-09T18:21:11-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-06-2160.jpg", @@ -206,6 +212,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "5.6", + "DateTimeOriginal": "2024-03-09T18:29:10-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-07-2160.jpg", @@ -238,6 +245,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "10", + "DateTimeOriginal": "2024-03-09T18:34:54-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-08-2160.jpg", @@ -270,6 +278,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "7.1", + "DateTimeOriginal": "2024-03-09T18:44:54-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-09-2160.jpg", @@ -302,6 +311,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "6.4", + "DateTimeOriginal": "2024-03-09T18:49:06-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-10-2160.jpg", @@ -334,6 +344,7 @@ "Lens": "21.0 mm", "FocalLength": "", "fStop": "1", + "DateTimeOriginal": "2024-03-09T19:02:59-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-11-2160.jpg", @@ -366,6 +377,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "9", + "DateTimeOriginal": "2024-03-09T19:27:20-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-12-2160.jpg", @@ -398,6 +410,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "16", + "DateTimeOriginal": "2024-03-09T19:33:40-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-13-2160.jpg", @@ -430,6 +443,7 @@ "Lens": "FUJIFILM XF16mm F1.4 R WR", "FocalLength": "", "fStop": "16", + "DateTimeOriginal": "2024-03-09T19:37:37-08:00", "Links": [ { "Url": "https://photos.duncanmackenzie.net/images/seattle-night-workshop/seattlenightworkshop-14-2160.jpg", diff --git a/themes/hello-friend-ng/assets/scss/galleries/_styles.scss b/themes/hello-friend-ng/assets/scss/galleries/_styles.scss index fbc60ed8..c37b92a7 100644 --- a/themes/hello-friend-ng/assets/scss/galleries/_styles.scss +++ b/themes/hello-friend-ng/assets/scss/galleries/_styles.scss @@ -1,13 +1,34 @@ -section.galleries a.card { +section.featured a.card, section.galleries a.card { text-decoration: none; } .pswp__dynamic-caption { .cameraInfo { font-size: x-small; + line-height: 1.0; } } +main.album { + width: 100%; + padding: 0 20px; + margin: auto; + + h1 { + margin-bottom: 0; + } + .albumDescription { + margin-top: 0; + } + + div.albumContent { + text-align: left; + max-width: 800px; + margin:auto; + } +} + + .photo-list { display:flex; flex-wrap: wrap; @@ -220,10 +241,28 @@ section.gallery { } } +section.featured .card { + div { + & > h2 { + font-weight: 600; + font-size: 2rem; + line-height: 2rem; + padding-bottom: 0; + margin: 0.5rem 0 0.3rem 0; + } + + & > p { + font-size: 0.875rem; + line-height: 1rem; + } + } +} + .card { display: flex; flex-direction: column; border-radius: 1rem; + position: relative; & > img { transition-duration: 150ms; @@ -253,121 +292,35 @@ section.gallery { font-weight: 600; font-size: 1.125rem; line-height: 0.875rem; + margin: 0.5rem 0 0.3rem 0; } - & > p { + & > span { + position: absolute; + top: 0.5rem; + right: 0.5rem; + padding: .25rem .5rem; + background-color: rgba(0, 0, 0, .7); + border-radius: 0.5rem; + color: #fff; + font-size: .75rem; color: var(--text-2); - font-size: 0.875rem; - line-height: 0.575rem; + font-size: .875rem; + line-height: .575rem; } - } -} - -.gallery-item { - cursor: zoom-in; -} - -.prose { - max-width: 768px; - color: var(--text-1); - font-size: 1rem; - line-height: 1.75; - - a { - color: var(--text-1); - font-weight: 500; - text-decoration: underline; - } - - p { - margin-top: 1.25em; - margin-bottom: 1.25em; - } - img { - margin-top: 2em; - margin-bottom: 2em; - } - - h3 { - margin-top: 1.6em; - margin-bottom: 0.6em; - color: var(--text-1); - font-weight: 600; - font-size: 1.25em; - line-height: 1.6; - } - - ul { - margin-top: 1.25em; - margin-bottom: 1.25em; - padding-left: 1.625em; - list-style-type: disc; - - & > li { - margin-top: 0.5em; - margin-bottom: 0.5em; - padding-left: 0.375em; - } - - li::marker { + & > p { color: var(--text-2); - font-variant-numeric: tabular-nums; - unicode-bidi: isolate; - text-align: start !important; - text-align-last: start !important; - text-indent: 0 !important; - text-transform: none; + font-size: 0.675rem; + line-height: 1rem; } } - - & > :first-child { - margin-top: 0; - } - - h3 + * { - margin-top: 0; - } - - figure { - margin-top: 2em; - margin-bottom: 2em; - } - - figure > * { - margin-top: 0; - margin-bottom: 0; - } - - > :first-child { - margin-top: 0; - } - - > :last-child { - margin-bottom: 0; - } -} - -.hidden { - display: none; } -.group[aria-expanded="true"] { - .group-aria-expanded\:block { - display: block; - } - - .group-aria-expanded\:hidden { - display: none; - } +.gallery-item { + cursor: zoom-in; } -section.social-icons { - display: flex; - column-gap: 1.5rem; - justify-content: center; - margin-top: 2rem; -} section.featured { margin: 3rem auto 4rem; diff --git a/themes/hello-friend-ng/layouts/albums/list.html b/themes/hello-friend-ng/layouts/albums/list.html index fc484082..d809fd28 100644 --- a/themes/hello-friend-ng/layouts/albums/list.html +++ b/themes/hello-friend-ng/layouts/albums/list.html @@ -6,27 +6,43 @@

{{ .Title }}

{{- if .Content }}
{{ .Content }}
{{- end }} - +
+ {{- range first 1 .Pages }} + {{- $gallery := . }} + {{- with $gallery }} + {{- $photoCount := len .Params.Pictures }} + {{- $thumbnailIndex := .Params.Featured }} + {{- $thumbnail := index .Params.Pictures $thumbnailIndex }} + {{- $thumbnailLink := index $thumbnail.Links 0 }} + + {{ .Title }} +
+

{{ .Title }}

+ {{ $photoCount }} photos + {{ with .Description }}

{{ . }}

{{ end }} +
+ + {{- end }} + {{- end }} +
- {{- range .Pages }} - {{ $gallery := . }} - {{ with $gallery }} - {{ $photoCount := len .Params.Pictures }} - {{ $thumbnailIndex := .Params.Featured }} - {{ $thumbnail := index .Params.Pictures $thumbnailIndex }} - {{ $thumbnailLink := index $thumbnail.Links 0 }} + {{- range after 1 .Pages }} + {{- $gallery := . }} + {{- with $gallery }} + {{- $photoCount := len .Params.Pictures }} + {{- $thumbnailIndex := .Params.Featured }} + {{- $thumbnail := index .Params.Pictures $thumbnailIndex }} + {{- $thumbnailLink := index $thumbnail.Links 0 }} {{ .Title }}

{{ .Title }}

-

- {{ $photoCount }} photos -

+ {{ $photoCount }} photos + {{ with .Description }}

{{ . }}

{{ end }}
- - {{ end }} - {{ end }} + {{- end }} + {{- end }}
{{ end }} diff --git a/themes/hello-friend-ng/layouts/albums/single.html b/themes/hello-friend-ng/layouts/albums/single.html index 074b84a9..e52512ec 100644 --- a/themes/hello-friend-ng/layouts/albums/single.html +++ b/themes/hello-friend-ng/layouts/albums/single.html @@ -1,47 +1,58 @@ {{ define "main" }} - + {{ end }}