Skip to content
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.

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

Release 20240604 #37

Merged
merged 48 commits into from
Jun 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
a86696a
WIP: f227371e Merge pull request #1047 from hlxsites/1045-refactor-cs…
amlan18041996 Apr 24, 2024
51867fd
WIP: a86696a8 WIP: f227371e Merge pull request #1047 from hlxsites/10…
amlan18041996 Apr 25, 2024
4070b4a
vertical alignment and horizontal stretch fixes
amlan18041996 Apr 25, 2024
3991a48
Merge branch 'main' into 1040-header-topic-pages
amlan18041996 Apr 25, 2024
634f9ac
Merge branch 'main' into 1040-header-topic-pages
amlan18041996 Apr 30, 2024
c2c197b
Merge branch 'main' into 1040-header-topic-pages
amlan18041996 Apr 30, 2024
804692e
1046 [Bug] On the workflow-carousel the icons don't always show
May 21, 2024
7491a59
reverted eslintrc change
May 21, 2024
1cff09a
1130 [Config] eslint error linebreak-style for window
May 21, 2024
24a73a3
Updated lint files
rgravitvl May 22, 2024
54df078
updated hlx and stylelint
rgravitvl May 23, 2024
ed2c97d
Merge branch 'main' into 1130-linebreak-window
rgravitvl May 23, 2024
484447a
Merge branch 'main' into 1046-workflow-icons
rgravitvl May 23, 2024
e5c6f40
Merge pull request #1135 from hlxsites/update-lint-files
rgravitvl May 23, 2024
18ab194
Minified the JS with Terser CLI
rgravitvl May 23, 2024
05498c7
Amending the image to contain rather than cover
davenichols-DHLS May 23, 2024
7b4e863
1141 [ReBrand] Converter update for logo-cloud
May 24, 2024
fdae33f
reverted eslintrc
May 27, 2024
1af6fe1
Merge pull request #1131 from hlxsites/1130-linebreak-window
sharanagoudapatil May 27, 2024
0201a78
Merge branch 'main' of https://github.com/hlxsites/danaher-ls-aem int…
May 27, 2024
bf2dce4
Merge branch 'main' into 1046-workflow-icons
sharanagoudapatil May 27, 2024
951bd4b
Merge pull request #1142 from hlxsites/1141-converter-logo-cloud
sharanagoudapatil May 27, 2024
5859330
Merge pull request #1129 from hlxsites/1046-workflow-icons
sharanagoudapatil May 27, 2024
6fd6843
[UE] enable the converter to skip some pages (#1100)
jckautzmann May 27, 2024
5513809
[UE] make text blocks editable with Universal Editor (#1117)
jckautzmann May 27, 2024
17aaf82
[ReBrand] About Us and DBS Page redesign and implement in Crosswalk
May 28, 2024
06e3398
Fixed height for jump menu
rgravitvl May 28, 2024
703be8c
1099 [Product] Product Recommendations click event not firing on Prod…
May 28, 2024
d786e84
Merge pull request #1144 from hlxsites/1140-seo-product-page-cls-issue
rgravitvl May 28, 2024
dccbdd2
[UE] pass-through converter: rewrite images (#1145)
jckautzmann May 28, 2024
a3473ef
Merge pull request #1138 from hlxsites/1137-images-product-family-list
davenichols-DHLS May 29, 2024
06425e9
Merge branch 'main' into 1099-prod-recom-clickevent
sharanagoudapatil May 29, 2024
6ca442e
Merge branch 'main' of https://github.com/hlxsites/danaher-ls-aem int…
May 29, 2024
28dc02c
Added 5 secs delay to loadEmbed()
May 29, 2024
3831834
Merge pull request #1146 from hlxsites/1099-prod-recom-clickevent
sharanagoudapatil May 30, 2024
0d714c3
embed-vimeo
davenichols-DHLS May 30, 2024
63a771a
Merge pull request #1143 from hlxsites/1133-about-us-rebrand
davenichols-DHLS May 30, 2024
eaaf185
Merge branch 'main' of https://github.com/hlxsites/danaher-ls-aem int…
May 30, 2024
04917c2
Merge pull request #1136 from hlxsites/1132-seo-minify-franklin-scrip…
davenichols-DHLS May 30, 2024
55840f1
1149 [Product] Product Recommendations click event source is missing
May 30, 2024
4888dba
Merge pull request #1150 from hlxsites/1149-prod-recom-source
sharanagoudapatil May 30, 2024
e68e229
Merge branch 'main' into 1040-header-topic-pages
amlan18041996 May 30, 2024
85e7ef2
Merge branch 'main' into 1040-header-topic-pages
amlan18041996 May 30, 2024
dabd922
Merge pull request #1066 from hlxsites/1040-header-topic-pages
sharanagoudapatil May 31, 2024
95a3e92
1151 [Bug] jump-menu dropdown displayed on desktop view on Solutions …
May 31, 2024
2a7ed4d
Merge pull request #1152 from hlxsites/1151-jump-menu-dropdown
sharanagoudapatil May 31, 2024
6295e2a
Updated embed height
rgravitvl Jun 4, 2024
2003efd
Merge pull request #1153 from hlxsites/fix-height-embed
davenichols-DHLS Jun 4, 2024
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 .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module.exports = {
rules: {
// allow reassigning param
'no-param-reassign': [2, { props: false }],
'linebreak-style': ['error', 'unix'],
'linebreak-style': ['error', (process.platform === 'win32' ? 'windows' : 'unix')],
'import/extensions': ['error', {
js: 'always',
}],
Expand Down
3 changes: 2 additions & 1 deletion .hlxignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ package.json
package-lock.json
test/*
styles/tailwind.css
blocks/**/*-dev.css
styles/proxy-tailwind.css
templates/**/*-dev.css
worker/*
*.toml
6 changes: 3 additions & 3 deletions blocks/category-family/category-family.css
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,9 @@
fill: currentColor !important
}

.category-family-wrapper :is(.object-cover) {
-o-object-fit: cover;
object-fit: cover
.category-family-wrapper :is(.object-contain) {
-o-object-fit: contain;
object-fit: contain
}

.category-family-wrapper :is(.p-0) {
Expand Down
2 changes: 1 addition & 1 deletion blocks/category-family/category-family.js
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ function resultList(response, categoryDiv) {
{ class: 'relative w-full h-full flex flex-col border rounded-md cursor-pointer transition z-10' },
div(
img({
class: 'category-image mb-2 h-48 w-full object-cover', src: image, alt: product.title, loading: 'lazy',
class: 'category-image mb-2 h-48 w-full object-contain', src: image, alt: product.title, loading: 'lazy',
}),
),
div(
Expand Down
4 changes: 3 additions & 1 deletion blocks/embed/embed.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,9 @@ export default function decorate(block) {
const observer = new IntersectionObserver((entries) => {
if (entries.some((e) => e.isIntersecting)) {
observer.disconnect();
loadEmbed(block, link);
setTimeout(() => {
loadEmbed(block, link);
}, 2000);
}
});
observer.observe(block);
Expand Down
149 changes: 93 additions & 56 deletions blocks/logo-clouds/logo-clouds.css
Original file line number Diff line number Diff line change
@@ -1,187 +1,224 @@
.logo-clouds-wrapper :is(.relative) {
position: relative
.href-text a {
position: relative;
z-index: 0;
text-decoration-line: underline;
text-decoration-color: #7523FF;
text-decoration-thickness: 2px;
text-underline-offset: 4px;
text-decoration-style: solid;
word-break: break-all;
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
transition-duration: 500ms;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
}

.href-text a:hover {
color: rgb(255 255 255);
background-color: #7523FF;
}

.logo-clouds-wrapper :is(.col-span-1) {
grid-column: span 1 / span 1
grid-column: span 1 / span 1;
}

.logo-clouds-wrapper :is(.mx-auto) {
margin-left: auto;
margin-right: auto
margin-right: auto;
}

.logo-clouds-wrapper :is(.my-2) {
margin-top: 0.5rem;
margin-bottom: 0.5rem
margin-bottom: 0.5rem;
}

.logo-clouds-wrapper :is(.ml-3) {
margin-left: 0.75rem;
}

.logo-clouds-wrapper :is(.mr-12) {
margin-right: 3rem;
}

.logo-clouds-wrapper :is(.mt-10) {
margin-top: 2.5rem;
}

.logo-clouds-wrapper :is(.mt-3) {
margin-top: 0.75rem;
}

.logo-clouds-wrapper :is(.mt-8) {
margin-top: 2rem
margin-top: 2rem;
}

.logo-clouds-wrapper :is(.block) {
display: block
display: block;
}

.logo-clouds-wrapper :is(.flex) {
display: flex
display: flex;
}

.logo-clouds-wrapper :is(.inline-flex) {
display: inline-flex;
}

.logo-clouds-wrapper :is(.grid) {
display: grid
display: grid;
}

.logo-clouds-wrapper :is(.h-12) {
height: 3rem
height: 3rem;
}

.logo-clouds-wrapper :is(.h-full) {
height: 100%
}

.logo-clouds-wrapper :is(.w-60) {
width: 15rem
height: 100%;
}

.logo-clouds-wrapper :is(.w-full) {
width: 100%
width: 100%;
}

.logo-clouds-wrapper :is(.max-w-7xl) {
max-width: 80rem
max-width: 80rem;
}

.logo-clouds-wrapper :is(.transform) {
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))
}

.logo-clouds-wrapper :is(.grid-cols-1) {
grid-template-columns: repeat(1, minmax(0, 1fr))
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}

.logo-clouds-wrapper :is(.grid-cols-2) {
grid-template-columns: repeat(2, minmax(0, 1fr))
grid-template-columns: repeat(2, minmax(0, 1fr));
}

.logo-clouds-wrapper :is(.items-center) {
align-items: center
align-items: center;
}

.logo-clouds-wrapper :is(.justify-center) {
justify-content: center
justify-content: center;
}

.logo-clouds-wrapper :is(.gap-0) {
gap: 0px
gap: 0px;
}

.logo-clouds-wrapper :is(.gap-0\.5) {
gap: 0.125rem
gap: 0.125rem;
}

.logo-clouds-wrapper :is(.gap-x-6) {
-moz-column-gap: 1.5rem;
column-gap: 1.5rem
.logo-clouds-wrapper :is(.rounded-full) {
border-radius: 9999px;
}

.logo-clouds-wrapper :is(.rounded-xl) {
border-radius: 0.75rem
border-radius: 0.75rem;
}

.logo-clouds-wrapper :is(.border-2) {
border-width: 2px
border-width: 2px;
}

.logo-clouds-wrapper :is(.border-transparent) {
border-color: transparent
border-color: transparent;
}

.logo-clouds-wrapper :is(.bg-danaherlightblue-50) {
--tw-bg-opacity: 1;
background-color: rgb(239 251 253 / var(--tw-bg-opacity))
background-color: rgb(239 251 253 / var(--tw-bg-opacity));
}

.logo-clouds-wrapper :is(.bg-gray-200) {
--tw-bg-opacity: 1;
background-color: rgb(229 231 235 / var(--tw-bg-opacity))
background-color: rgb(229 231 235 / var(--tw-bg-opacity));
}

.logo-clouds-wrapper :is(.bg-white) {
--tw-bg-opacity: 1;
background-color: rgb(255 255 255 / var(--tw-bg-opacity))
background-color: rgb(255 255 255 / var(--tw-bg-opacity));
}

.logo-clouds-wrapper :is(.p-3) {
padding: 0.75rem;
}

.logo-clouds-wrapper :is(.px-6) {
padding-left: 1.5rem;
padding-right: 1.5rem;
}

.logo-clouds-wrapper :is(.px-8) {
padding-left: 2rem;
padding-right: 2rem
padding-right: 2rem;
}

.logo-clouds-wrapper :is(.py-8) {
padding-top: 2rem;
padding-bottom: 2rem
}

.logo-clouds-wrapper :is(.text-3xl) {
font-size: 1.875rem;
line-height: 2.25rem
padding-bottom: 2rem;
}

.logo-clouds-wrapper :is(.text-lg) {
font-size: 1.125rem;
line-height: 1.75rem
line-height: 1.75rem;
}

.logo-clouds-wrapper :is(.font-medium) {
font-weight: 500
font-weight: 500;
}

.logo-clouds-wrapper :is(.leading-7) {
line-height: 1.75rem;
}

.logo-clouds-wrapper :is(.font-semibold) {
font-weight: 700
.logo-clouds-wrapper :is(.text-danahergray-700) {
--tw-text-opacity: 1;
color: rgb(55 65 81 / var(--tw-text-opacity));
}

.logo-clouds-wrapper :is(.transition) {
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, -webkit-backdrop-filter;
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter;
transition-property: color, background-color, border-color, text-decoration-color, fill, stroke, opacity, box-shadow, transform, filter, backdrop-filter, -webkit-backdrop-filter;
transition-timing-function: cubic-bezier(0.4, 0, 0.2, 1);
transition-duration: 150ms
transition-duration: 150ms;
}

.logo-clouds-wrapper :is(.duration-500) {
transition-duration: 500ms
transition-duration: 500ms;
}

.logo-clouds-wrapper :is(.hover\:scale-105:hover) {
--tw-scale-x: 1.05;
--tw-scale-y: 1.05;
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y))
transform: translate(var(--tw-translate-x), var(--tw-translate-y)) rotate(var(--tw-rotate)) skewX(var(--tw-skew-x)) skewY(var(--tw-skew-y)) scaleX(var(--tw-scale-x)) scaleY(var(--tw-scale-y));
}

@media (min-width: 768px) {
.logo-clouds-wrapper :is(.md\:grid-cols-3) {
grid-template-columns: repeat(3, minmax(0, 1fr))
grid-template-columns: repeat(3, minmax(0, 1fr));
}
}

@media (min-width: 1024px) {
.logo-clouds-wrapper :is(.lg\:mt-0) {
margin-top: 0px
margin-top: 0px;
}

.logo-clouds-wrapper :is(.lg\:grid) {
display: grid
display: grid;
}

.logo-clouds-wrapper :is(.lg\:grid-cols-2) {
grid-template-columns: repeat(2, minmax(0, 1fr))
grid-template-columns: repeat(2, minmax(0, 1fr));
}

.logo-clouds-wrapper :is(.lg\:items-center) {
align-items: center
align-items: center;
}

.logo-clouds-wrapper :is(.lg\:gap-8) {
gap: 2rem
gap: 2rem;
}
}
Loading
Loading