Allow images in resource folder and resize for mobile #31
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,50 @@ | ||
| {{ define "main" }} | ||
| <header> | ||
| <h2>{{ .Title }}</h2> | ||
| {{ with .Description }} | ||
| <p>{{ . }}</p> | ||
| {{ end }} | ||
| </header> | ||
|
|
||
| {{- if .Params.image }} | ||
| {{- $alt := .Params.image_alt | default .Title -}} | ||
| {{- with $img := resources.Get .Params.image }} | ||
| {{ $image_options := $.Site.Params.image_options | default "webp q85 lanczos photo" }} | ||
| <picture class="image featured"> | ||
| {{- $breakpoints := slice 1920 1600 1366 900 600 360 -}} | ||
| {{- range $bp := $breakpoints }} | ||
| {{- if le $bp .Width }} | ||
| {{- with .Resize (printf "%dx %s" $bp $image_options) }} | ||
| <source srcset="{{ .RelPermalink }}" type="{{ .MediaType.Type }}" media="(max-width: {{ $bp }}px)"> | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- /* Fallback: full-sized optimized image */ -}} | ||
| {{- with .Resize (printf "%dx %s" .Width $image_options) }} | ||
| <img | ||
| src="{{ .RelPermalink }}" | ||
| srcset="{{- range $bp := $breakpoints -}} | ||
| {{- with $.Resize (printf "%dx %s" $bp $image_options) -}} | ||
| {{ .RelPermalink }} {{ .Width }}w, | ||
| {{- end -}} | ||
| {{- end -}}" | ||
| sizes="(max-width: 1920px) 100vw, 1920px" | ||
| alt="{{ $alt }}" | ||
| width="{{ .Width }}" | ||
| height="{{ .Height }}" | ||
| loading="lazy" | ||
| class="img-fluid" /> | ||
| {{- end }} | ||
| </picture> | ||
| {{- else }} | ||
| <span class="image featured"> | ||
| <img src="{{ .Params.image | relURL }}" alt="{{ $alt }}"> | ||
| </span> | ||
| {{- end }} | ||
| {{ end }} | ||
|
|
||
| {{ range .RegularPages }} | ||
| {{ .Render "shortblock" }} | ||
| {{ end }} | ||
| {{ end }} | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,55 @@ | ||
| <section class="col-6 col-12-narrower"> | ||
| <div class="box post"> | ||
| <a href="{{ .RelPermalink }}" class="image left"> | ||
| {{- $alt := .Params.image_alt | default .Title -}} | ||
| {{- with $img := resources.Get .Params.image }} | ||
| {{ $image_options := $.Site.Params.image_options | default "webp q85 lanczos photo" }} | ||
| {{- $breakpoints := slice 800 600 400 300 -}} | ||
| {{- $orig := $img -}} | ||
|
|
||
| <picture> | ||
| {{- range $bp := $breakpoints }} | ||
| {{- if le $bp $orig.Width }} | ||
| {{- with $orig.Resize (printf "%dx %s" $bp $image_options) }} | ||
| <source srcset="{{ .RelPermalink }}" type="{{ .MediaType.Type }}" media="(max-width: {{ $bp }}px)"> | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{- /* Fallback main image (max 800px) */ -}} | ||
| {{- with $orig.Resize (printf "800x %s" $image_options) }} | ||
| <img | ||
| src="{{ .RelPermalink }}" | ||
| srcset="{{- range $bp := $breakpoints -}} | ||
| {{- with $orig.Resize (printf "%dx %s" $bp $image_options) -}} | ||
| {{ .RelPermalink }} {{ .Width }}w, | ||
| {{- end -}} | ||
| {{- end -}}" | ||
| sizes="(max-width: 800px) 100vw, 300px" | ||
| alt="{{ $alt }}" | ||
| width="{{ .Width }}" | ||
| height="{{ .Height }}" | ||
|
Comment on lines
+30
to
+31
Owner
There was a problem hiding this comment. Moving the exampleSite images from static/ to assets/ to test, this makes the front page block show a very tall left 10% of the image. Similar scale/size issues on the post list and post pages. |
||
| loading="lazy" | ||
| class="img-fluid" /> | ||
| {{- end }} | ||
| </picture> | ||
| {{- else }} | ||
| <img src="{{ .Params.image | relURL }}" alt="{{ $alt }}"> | ||
| {{- end }} | ||
| </a> | ||
|
|
||
| <div class="inner"> | ||
| <h3><a href="{{ .RelPermalink }}">{{ .Title }}</a></h3> | ||
| {{ if .Site.Params.show_post_dates | default true }} | ||
| {{- with .Date }}<time>{{ . | time.Format ":date_medium" }}</time>{{ end }} | ||
| {{ end }} | ||
| <p> | ||
| {{ with .Description }} | ||
| {{- . }} | ||
| {{- else }} | ||
| {{- .Summary }} | ||
| {{- end }} | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </section> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,11 @@ | ||
| {{- $js := slice | ||
| (resources.Get "js/jquery.min.js") | ||
| (resources.Get "js/jquery.dropotron.min.js") | ||
| (resources.Get "js/browser.min.js") | ||
| (resources.Get "js/breakpoints.min.js") | ||
| (resources.Get "js/util.js") | ||
| (resources.Get "js/main.js") | ||
| -}} | ||
|
|
||
| {{- $bundle := $js | resources.Concat "js/bundle.js" | resources.Minify | resources.Fingerprint -}} | ||
| <script src="{{ $bundle.RelPermalink }}" integrity="{{ $bundle.Data.Integrity }}" crossorigin="anonymous"></script> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should this exclude sizes larger than the original image?