Skip to content

Commit

Permalink
Merge branch 'develop' into PWA-3052
Browse files Browse the repository at this point in the history
  • Loading branch information
glo82145 authored Jan 6, 2023
2 parents 2032628 + 5264e6c commit 83d5a8f
Show file tree
Hide file tree
Showing 49 changed files with 406 additions and 47 deletions.
2 changes: 1 addition & 1 deletion packages/pagebuilder/lib/ContentTypes/Slider/slider.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ const Slider = props => {
paddingLeft
};
const jarallaxInstances = {};

const sliderSettings = {
dots: showDots,
arrows: showArrows,
Expand All @@ -88,7 +89,6 @@ const Slider = props => {
autoplaySpeed,
fade
};

// Override classes on banner to ensure min height is respected
Children.map(children, (child, index) => {
if (child.props && child.props.data) {
Expand Down
17 changes: 7 additions & 10 deletions packages/pagebuilder/lib/ContentTypes/Slider/slider.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -125,16 +125,6 @@
display: none;
}

.root :global .slick-prev,
.root :global .slick-next {
opacity: 0;
transition: 0.3s;
}
.root:hover :global .slick-prev,
.root:hover :global .slick-next {
opacity: 1;
}

.root :global .slick-prev {
left: 1.6rem;
}
Expand All @@ -160,6 +150,7 @@
font-size: 0;
height: 40px;
line-height: 0;
opacity: 1;
outline: none;
padding: 0;
position: absolute;
Expand All @@ -169,6 +160,12 @@
z-index: 101;
}

.root :global .slick-prev:focus-visible,
.root :global .slick-next:focus-visible {
outline: auto;
outline: -webkit-focus-ring-color auto 1px;
}

.root :global .slick-dots {
display: block;
list-style: none;
Expand Down
7 changes: 7 additions & 0 deletions packages/venia-ui/i18n/en_US.json
Original file line number Diff line number Diff line change
Expand Up @@ -482,6 +482,13 @@
"wishlist.itemCountOpen": "Showing {currentCount} of {count} items in this list",
"wishlist.itemCountClosed": "You have {count} {count, plural, one {item} other {items}} in this list",
"wishlist.loadMore": "Load More",
"LegacyMiniCart.buttonExpanded":"More Options Expanded",
"LegacyMiniCart.buttonCollapsed":"More Options Collapsed",
"global.deletedButton":"Item Deleted",
"password.hide":"Hide Password",
"password.View":"View Password",
"global.clearText":"Clear Text",
"global.close":"Close",
"global.firstNameRequired":"First Name Required",
"global.lastNameRequired":"Last Name Required",
"global.emailRequired":"Email Required",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ exports[`renders form when shouldShowNewPassword is false 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
/>
</span>
Expand Down Expand Up @@ -91,6 +92,7 @@ exports[`renders form when shouldShowNewPassword is false 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
/>
</span>
Expand Down Expand Up @@ -136,6 +138,7 @@ exports[`renders form when shouldShowNewPassword is false 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
/>
</span>
Expand Down Expand Up @@ -183,13 +186,15 @@ exports[`renders form when shouldShowNewPassword is false 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
>
<button
className="passwordButton"
disabled={false}
onClick={[Function]}
onDragStart={[Function]}
onKey={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
Expand All @@ -206,6 +211,7 @@ exports[`renders form when shouldShowNewPassword is false 1`] = `
className="content"
>
<svg
aria-label="View Password"
fill="none"
height={24}
stroke="currentColor"
Expand Down Expand Up @@ -315,6 +321,7 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
/>
</span>
Expand Down Expand Up @@ -360,6 +367,7 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
/>
</span>
Expand Down Expand Up @@ -405,6 +413,7 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
/>
</span>
Expand Down Expand Up @@ -452,13 +461,15 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
>
<button
className="passwordButton"
disabled={false}
onClick={[Function]}
onDragStart={[Function]}
onKey={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
Expand All @@ -475,6 +486,7 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="content"
>
<svg
aria-label="View Password"
fill="none"
height={24}
stroke="currentColor"
Expand Down Expand Up @@ -542,13 +554,15 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="before"
/>
<span
aria-hidden="false"
className="after"
>
<button
className="passwordButton"
disabled={false}
onClick={[Function]}
onDragStart={[Function]}
onKey={true}
onKeyDown={[Function]}
onKeyUp={[Function]}
onMouseDown={[Function]}
Expand All @@ -565,6 +579,7 @@ exports[`renders form when shouldShowNewPassword is true 1`] = `
className="content"
>
<svg
aria-label="View Password"
fill="none"
height={24}
stroke="currentColor"
Expand Down
Loading

0 comments on commit 83d5a8f

Please sign in to comment.