Skip to content

Commit

Permalink
Merge pull request #126 from flyntwp/timberDynamicResize
Browse files Browse the repository at this point in the history
feat(timberDynamicResize): use in all components
  • Loading branch information
domtra authored Aug 7, 2019
2 parents 3aa47ba + 93019d8 commit 074470c
Show file tree
Hide file tree
Showing 15 changed files with 105 additions and 105 deletions.
12 changes: 6 additions & 6 deletions Components/BlockImageTextCta/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@
<div class="box-inner box-inner--image">
<figure class="figure">
<img class="figure-image lazyload"
src="{{ image.src|resize(665) }}"
src="{{ image.src|resizeDynamic(665) }}"
srcset="{{ placeholderImage(665, 665 / image.aspect) }}"
data-srcset="
{{ image.src|resize(920) }} 920w,
{{ image.src|resize(815) }} 815w,
{{ image.src|resize(740) }} 740w,
{{ image.src|resize(665) }} 665w,
{{ image.src|resize(375) }} 375w"
{{ image.src|resizeDynamic(920) }} 920w,
{{ image.src|resizeDynamic(815) }} 815w,
{{ image.src|resizeDynamic(740) }} 740w,
{{ image.src|resizeDynamic(665) }} 665w,
{{ image.src|resizeDynamic(375) }} 375w"
data-sizes="auto"
alt="{{ image.alt|e }}">
{% if image.caption %}
Expand Down
8 changes: 4 additions & 4 deletions Components/BlockTextImageCrop/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
<div class="box-inner box-inner--image">
<figure class="figure imagecontainer">
<img class="figure-image lazyload imagecontainer-img"
src="{{ image.src|resize(1280) }}"
src="{{ image.src|resizeDynamic(1280) }}"
srcset="{{ placeholderImage(1280, 1280 / image.aspect) }}"
data-srcset="
{{ image.src|resize(1280) }} 1280w,
{{ image.src|resize(768) }} 768w,
{{ image.src|resize(375) }} 375w"
{{ image.src|resizeDynamic(1280) }} 1280w,
{{ image.src|resizeDynamic(768) }} 768w,
{{ image.src|resizeDynamic(375) }} 375w"
data-sizes="auto"
alt="{{ image.alt|e }}">
{% if image.caption %}
Expand Down
8 changes: 4 additions & 4 deletions Components/GridDownloadPortrait/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
<img
class="download-image lazyload"
srcset="{{ placeholderImage(370, 555) }}"
src="{{ item.image.src|resize(370, 555) }}"
src="{{ item.image.src|resizeDynamic(370, 555) }}"
data-srcset="
{{ item.image.src|resize(450, 675) }} 450w,
{{ item.image.src|resize(370, 555) }} 370w,
{{ item.image.src|resize(240, 360) }} 240w"
{{ item.image.src|resizeDynamic(450, 675) }} 450w,
{{ item.image.src|resizeDynamic(370, 555) }} 370w,
{{ item.image.src|resizeDynamic(240, 360) }} 240w"
sizes="auto"
alt="{{ item.image.alt|e }}">
{% endif %}
Expand Down
16 changes: 8 additions & 8 deletions Components/GridImageText/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
<li class="grid-item">
<div class="content {{ options.card == 'layoutCard' ? 'boxShadow themeReset' }}">
<img class="content-image lazyload"
src="{{ item.image.src|resize(750, 500) }}"
src="{{ item.image.src|resizeDynamic(750, 500) }}"
srcset="{{ placeholderImage(3, 2) }}"
data-srcset="
{{ item.image.src|resize(1920, 1280) }} 1920w,
{{ item.image.src|resize(1280, 853) }} 1280w,
{{ item.image.src|resize(1050, 700) }} 1050w,
{{ item.image.src|resize(750, 500) }} 750w,
{{ item.image.src|resize(600, 400) }} 600w,
{{ item.image.src|resize(480, 320) }} 480w,
{{ item.image.src|resize(312, 208) }} 312w"
{{ item.image.src|resizeDynamic(1920, 1280) }} 1920w,
{{ item.image.src|resizeDynamic(1280, 853) }} 1280w,
{{ item.image.src|resizeDynamic(1050, 700) }} 1050w,
{{ item.image.src|resizeDynamic(750, 500) }} 750w,
{{ item.image.src|resizeDynamic(600, 400) }} 600w,
{{ item.image.src|resizeDynamic(480, 320) }} 480w,
{{ item.image.src|resizeDynamic(312, 208) }} 312w"
data-sizes="auto"
alt="{{ item.image.alt|e }}">
{% if item.contentHtml %}
Expand Down
10 changes: 5 additions & 5 deletions Components/GridPostsArchive/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
{% if post.thumbnail %}
<figure class="figure">
<img class="figure-image lazyload"
src="{{ post.thumbnail|resize(424, 283) }}"
src="{{ post.thumbnail.src|resizeDynamic(424, 283) }}"
srcset="{{ placeholderImage(424, 283) }}"
data-srcset="
{{ post.thumbnail|resize(1280, 853) }} 1280w,
{{ post.thumbnail|resize(750, 500) }} 750w,
{{ post.thumbnail|resize(424, 283) }} 424w,
{{ post.thumbnail|resize(375, 250) }} 375w"
{{ post.thumbnail.src|resizeDynamic(1280, 853) }} 1280w,
{{ post.thumbnail.src|resizeDynamic(750, 500) }} 750w,
{{ post.thumbnail.src|resizeDynamic(424, 283) }} 424w,
{{ post.thumbnail.src|resizeDynamic(375, 250) }} 375w"
data-sizes="auto"
alt="{{ post.thumbnail.alt|e }}">
</figure>
Expand Down
16 changes: 8 additions & 8 deletions Components/GridPostsLatest/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<div class="content boxShadow themeReset">
<a href="{{ item.link }}" class="content-link">
<img class="content-image lazyload"
src="{{ item.thumbnail|resize(750, 500) }}"
src="{{ item.thumbnail.src|resizeDynamic(750, 500) }}"
srcset="{{ placeholderImage(3, 2) }}"
data-srcset="
{{ item.thumbnail|resize(1920, 1280) }} 1920w,
{{ item.thumbnail|resize(1280, 853) }} 1280w,
{{ item.thumbnail|resize(1050, 700) }} 1050w,
{{ item.thumbnail|resize(750, 500) }} 750w,
{{ item.thumbnail|resize(600, 400) }} 600w,
{{ item.thumbnail|resize(480, 320) }} 480w,
{{ item.thumbnail|resize(312, 208) }} 312w"
{{ item.thumbnail.src|resizeDynamic(1920, 1280) }} 1920w,
{{ item.thumbnail.src|resizeDynamic(1280, 853) }} 1280w,
{{ item.thumbnail.src|resizeDynamic(1050, 700) }} 1050w,
{{ item.thumbnail.src|resizeDynamic(750, 500) }} 750w,
{{ item.thumbnail.src|resizeDynamic(600, 400) }} 600w,
{{ item.thumbnail.src|resizeDynamic(480, 320) }} 480w,
{{ item.thumbnail.src|resizeDynamic(312, 208) }} 312w"
data-sizes="auto"
alt="{{ item.thumbnail.alt|e }}">
<div class="content-inner boxPadding">
Expand Down
10 changes: 5 additions & 5 deletions Components/GridPostsSlider/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
{% if item.thumbnail %}
<figure class="figure">
<img class="image lazyload"
src="{{ item.thumbnail|resize(300, 200) }}"
src="{{ item.thumbnail.src|resizeDynamic(300, 200) }}"
srcset="{{ placeholderImage(300, 200) }}"
data-srcset="
{{ item.thumbnail|resize(912, 608) }} 608w,
{{ item.thumbnail|resize(600, 400) }} 600w,
{{ item.thumbnail|resize(456, 304) }} 456w,
{{ item.thumbnail|resize(300, 200) }} 300w"
{{ item.thumbnail.src|resizeDynamic(912, 608) }} 608w,
{{ item.thumbnail.src|resizeDynamic(600, 400) }} 600w,
{{ item.thumbnail.src|resizeDynamic(456, 304) }} 456w,
{{ item.thumbnail.src|resizeDynamic(300, 200) }} 300w"
data-sizes="auto"
alt="{{ item.thumbnail.alt|e }}">
</figure>
Expand Down
16 changes: 8 additions & 8 deletions Components/GridPostsTeaser/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
<li class="grid-item">
<a href="{{ item.link }}" class="content boxShadow themeReset">
<img class="content-image lazyload"
src="{{ item.thumbnail|resize(750, 500) }}"
src="{{ item.thumbnail.src|resizeDynamic(750, 500) }}"
srcset="{{ placeholderImage(3, 2) }}"
data-srcset="
{{ item.thumbnail|resize(1920, 1280) }} 1920w,
{{ item.thumbnail|resize(1280, 853) }} 1280w,
{{ item.thumbnail|resize(1050, 700) }} 1050w,
{{ item.thumbnail|resize(750, 500) }} 750w,
{{ item.thumbnail|resize(600, 400) }} 600w,
{{ item.thumbnail|resize(480, 320) }} 480w,
{{ item.thumbnail|resize(312, 208) }} 312w"
{{ item.thumbnail.src|resizeDynamic(1920, 1280) }} 1920w,
{{ item.thumbnail.src|resizeDynamic(1280, 853) }} 1280w,
{{ item.thumbnail.src|resizeDynamic(1050, 700) }} 1050w,
{{ item.thumbnail.src|resizeDynamic(750, 500) }} 750w,
{{ item.thumbnail.src|resizeDynamic(600, 400) }} 600w,
{{ item.thumbnail.src|resizeDynamic(480, 320) }} 480w,
{{ item.thumbnail.src|resizeDynamic(312, 208) }} 312w"
data-sizes="auto"
alt="{{ item.thumbnail.alt|e }}">
<div class="content-inner">
Expand Down
8 changes: 4 additions & 4 deletions Components/GridTeaserTiles/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
<img
class="teaser-image lazyload"
srcset="{{ placeholderImage(404, 404) }}"
src="{{ item.image.src|resize(404, 404) }}"
src="{{ item.image.src|resizeDynamic(404, 404) }}"
data-srcset="
{{ item.image.src|resize(808, 808) }} 808w,
{{ item.image.src|resize(404, 404) }} 404w,
{{ item.image.src|resize(250, 250) }} 250w"
{{ item.image.src|resizeDynamic(808, 808) }} 808w,
{{ item.image.src|resizeDynamic(404, 404) }} 404w,
{{ item.image.src|resizeDynamic(250, 250) }} 250w"
sizes="auto"
alt="{{ item.image.alt|e }}"
>
Expand Down
30 changes: 15 additions & 15 deletions Components/HeroImageCta/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
{% if images.imageMobile %}
<source
srcset="
{{ images.imageDesktop.src | resize(2560) }} 2560w,
{{ images.imageDesktop.src | resize(2048) }} 2048w,
{{ images.imageDesktop.src | resize(1320) }} 1320w,
{{ images.imageDesktop.src | resize(1024) }} 1024w,
{{ images.imageDesktop.src | resize(768) }} 768w"
{{ images.imageDesktop.src | resizeDynamic(2560) }} 2560w,
{{ images.imageDesktop.src | resizeDynamic(2048) }} 2048w,
{{ images.imageDesktop.src | resizeDynamic(1320) }} 1320w,
{{ images.imageDesktop.src | resizeDynamic(1024) }} 1024w,
{{ images.imageDesktop.src | resizeDynamic(768) }} 768w"
media="(min-width: 768px)">
<img
class="content-image lazyload
Expand All @@ -19,9 +19,9 @@
{{ options.alignImage.desktop.vertical }}
{{ options.alignImage.desktop.horizontal }}"
srcset="
{{ images.imageMobile.src| resize(375) }} 375w,
{{ images.imageMobile.src | resize(750) }} 750w"
src="{{ images.imageDesktop.src | resize(375) }}"
{{ images.imageMobile.src| resizeDynamic(375) }} 375w,
{{ images.imageMobile.src | resizeDynamic(750) }} 750w"
src="{{ images.imageDesktop.src | resizeDynamic(375) }}"
data-sizes="auto"
alt="{{ images.imageDesktop.alt|e }}">
{% else %}
Expand All @@ -32,13 +32,13 @@
{{ options.alignImage.desktop.vertical }}
{{ options.alignImage.desktop.horizontal }}"
srcset="
{{ images.imageDesktop.src | resize(2560) }} 2560w,
{{ images.imageDesktop.src | resize(2048) }} 2048w,
{{ images.imageDesktop.src | resize(1320) }} 1320w,
{{ images.imageDesktop.src | resize(1024) }} 1024w,
{{ images.imageDesktop.src | resize(768) }} 768w,
{{ images.imageDesktop.src | resize(375) }} 375w"
src="{{ images.imageDesktop.src | resize(375) }}"
{{ images.imageDesktop.src | resizeDynamic(2560) }} 2560w,
{{ images.imageDesktop.src | resizeDynamic(2048) }} 2048w,
{{ images.imageDesktop.src | resizeDynamic(1320) }} 1320w,
{{ images.imageDesktop.src | resizeDynamic(1024) }} 1024w,
{{ images.imageDesktop.src | resizeDynamic(768) }} 768w,
{{ images.imageDesktop.src | resizeDynamic(375) }} 375w"
src="{{ images.imageDesktop.src | resizeDynamic(375) }}"
data-sizes="auto"
alt="{{ images.imageDesktop.alt|e }}">
{% endif %}
Expand Down
16 changes: 8 additions & 8 deletions Components/HeroImageText/index.twig
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
<div class="flyntComponent" is="flynt-hero-image-text">
<picture>
<source srcset="
{{ images.imageDesktop.src | resize(2560, 800, 'center') }} 2560w,
{{ images.imageDesktop.src | resize(2048, 800, 'center') }} 2048w,
{{ images.imageDesktop.src | resize(1440, 400, 'center') }} 1280w,
{{ images.imageDesktop.src | resize(900, 400, 'center') }} 900w,
{{ images.imageDesktop.src | resize(768, 400, 'center') }} 768w"
{{ images.imageDesktop.src | resizeDynamic(2560, 800, 'center') }} 2560w,
{{ images.imageDesktop.src | resizeDynamic(2048, 800, 'center') }} 2048w,
{{ images.imageDesktop.src | resizeDynamic(1440, 400, 'center') }} 1280w,
{{ images.imageDesktop.src | resizeDynamic(900, 400, 'center') }} 900w,
{{ images.imageDesktop.src | resizeDynamic(768, 400, 'center') }} 768w"
media="(min-width: 600px)"
sizes="100vw">
<img class="image" srcset="
{{ images.imageMobile.src | resize(375, 400) }} 375w,
{{ images.imageMobile.src | resize(750, 800) }} 750w"
src="{{ images.imageMobile.src | resize(375, 400) }}"
{{ images.imageMobile.src | resizeDynamic(375, 400) }} 375w,
{{ images.imageMobile.src | resizeDynamic(750, 800) }} 750w"
src="{{ images.imageMobile.src | resizeDynamic(375, 400) }}"
sizes="100vw"
alt="{{ images.imageDesktop.alt|e }}">
</picture>
Expand Down
16 changes: 8 additions & 8 deletions Components/ListLogos/Partials/Image/index.twig
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<figure class="image">
{% if not image.svg %}
<img class="image-tag lazyload lazyload--fade"
src="{{ image.src|resize(384, 216) }}"
src="{{ image.src|resizeDynamic(384, 216) }}"
srcset="{{ placeholderImage(384, 216) }}"
data-srcset="
{{ image.src|resize(384, 216) }} 384w,
{{ image.src|resize(240, 135) }} 240w,
{{ image.src|resize(206, 116) }} 206w,
{{ image.src|resize(170, 96) }} 170w,
{{ image.src|resize(164, 92) }} 164w,
{{ image.src|resize(128, 72) }} 128w,
{{ image.src|resize(114, 64) }} 114w"
{{ image.src|resizeDynamic(384, 216) }} 384w,
{{ image.src|resizeDynamic(240, 135) }} 240w,
{{ image.src|resizeDynamic(206, 116) }} 206w,
{{ image.src|resizeDynamic(170, 96) }} 170w,
{{ image.src|resizeDynamic(164, 92) }} 164w,
{{ image.src|resizeDynamic(128, 72) }} 128w,
{{ image.src|resizeDynamic(114, 64) }} 114w"
data-sizes="auto"
alt="{{ image.alt|e }}">
{% else %}
Expand Down
22 changes: 11 additions & 11 deletions Components/SliderImageGallery/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
<div class="swiper-slide sliderMain-item">
<figure class="figure">
<img class="figure-image lazyload"
src="{{ image.src|resize(0, 683) }}"
src="{{ image.src|resizeDynamic(0, 683) }}"
srcset="{{ placeholderImage(image.aspect * 683, 683) }}"
data-srcset="
{{ image.src|resize(0, 1300) }} {{ (image.aspect * 1300)|round }}w,
{{ image.src|resize(0, 1024) }} {{ (image.aspect * 1024)|round }}w,
{{ image.src|resize(0, 750) }} {{ (image.aspect * 750)|round }}w,
{{ image.src|resize(0, 683) }} {{ (image.aspect * 683)|round }}w,
{{ image.src|resize(0, 512) }} {{ (image.aspect * 512)|round }}w,
{{ image.src|resize(0, 385) }} {{ (image.aspect * 385)|round }}w,
{{ image.src|resize(0, 250) }} {{ (image.aspect * 250)|round }}w"
{{ image.src|resizeDynamic(0, 1300) }} {{ (image.aspect * 1300)|round }}w,
{{ image.src|resizeDynamic(0, 1024) }} {{ (image.aspect * 1024)|round }}w,
{{ image.src|resizeDynamic(0, 750) }} {{ (image.aspect * 750)|round }}w,
{{ image.src|resizeDynamic(0, 683) }} {{ (image.aspect * 683)|round }}w,
{{ image.src|resizeDynamic(0, 512) }} {{ (image.aspect * 512)|round }}w,
{{ image.src|resizeDynamic(0, 385) }} {{ (image.aspect * 385)|round }}w,
{{ image.src|resizeDynamic(0, 250) }} {{ (image.aspect * 250)|round }}w"
data-sizes="auto"
alt="{{ image.alt|e }}">
{% if image.caption %}
Expand All @@ -44,10 +44,10 @@
<figure class="figure">
<img class="figure-image lazyload"
srcset="{{ placeholderImage(image.aspect * 65, 65) }}"
src="{{ image.src|resize(0, 65) }}"
src="{{ image.src|resizeDynamic(0, 65) }}"
data-srcset="
{{ image.src|resize(0, 65) }} {{ (image.aspect * 65)|round }}w,
{{ image.src|resize(0, 130) }} {{ (image.aspect * 130)|round }}w"
{{ image.src|resizeDynamic(0, 65) }} {{ (image.aspect * 65)|round }}w,
{{ image.src|resizeDynamic(0, 130) }} {{ (image.aspect * 130)|round }}w"
alt="{{ image.alt|e }}">
</figure>
</div>
Expand Down
12 changes: 6 additions & 6 deletions Components/SliderImages/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@
<div class="slider-item swiper-slide">
<figure class="figure">
<img class="figure-image lazyload"
src="{{ image.src|resize(0, 540) }}"
src="{{ image.src|resizeDynamic(0, 540) }}"
srcset="{{ placeholderImage(image.aspect * 540, 540) }}"
data-srcset="
{{ image.src|resize(0, 1080) }} {{ (image.aspect * 1080)|round }}w,
{{ image.src|resize(0, 800) }} {{ (image.aspect * 800)|round }}w,
{{ image.src|resize(0, 540) }} {{ (image.aspect * 540)|round }}w,
{{ image.src|resize(0, 385) }} {{ (image.aspect * 385)|round }}w,
{{ image.src|resize(0, 250) }} {{ (image.aspect * 250)|round }}w"
{{ image.src|resizeDynamic(0, 1080) }} {{ (image.aspect * 1080)|round }}w,
{{ image.src|resizeDynamic(0, 800) }} {{ (image.aspect * 800)|round }}w,
{{ image.src|resizeDynamic(0, 540) }} {{ (image.aspect * 540)|round }}w,
{{ image.src|resizeDynamic(0, 385) }} {{ (image.aspect * 385)|round }}w,
{{ image.src|resizeDynamic(0, 250) }} {{ (image.aspect * 250)|round }}w"
data-sizes="auto"
alt="{{ image.alt|e }}">
{% if image.caption %}
Expand Down
10 changes: 5 additions & 5 deletions Components/SliderImagesCentered/index.twig
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
<div class="slider-item swiper-slide">
<figure class="figure">
<img class="figure-image lazyload"
src="{{ image.src|resize(870, 580) }}"
src="{{ image.src|resizeDynamic(870, 580) }}"
srcset="{{ placeholderImage(870, 580) }}"
data-srcset="
{{ image.src|resize(1740, 1160) }} 1160w,
{{ image.src|resize(870, 580) }} 870w,
{{ image.src|resize(580, 385) }} 580w,
{{ image.src|resize(375, 246) }} 375w"
{{ image.src|resizeDynamic(1740, 1160) }} 1160w,
{{ image.src|resizeDynamic(870, 580) }} 870w,
{{ image.src|resizeDynamic(580, 385) }} 580w,
{{ image.src|resizeDynamic(375, 246) }} 375w"
data-sizes="auto"
alt="{{ image.alt|e }}">
{% if image.caption %}
Expand Down

0 comments on commit 074470c

Please sign in to comment.