Skip to content

Commit

Permalink
Add prettier config to support format-on-save (Shopify#2323)
Browse files Browse the repository at this point in the history
* Add prettier config file

* Prettify JS and CSS files

Run base.css through prettier

Run global.js through prettier

Add prettier to list of recommended settings and enable format on save

Prettify base and global again

Remove unnecessary params for prettierrc

Run all files through prettier

Fix rule re-added by bad rebase

Revery mask-blobs (don't prettier it)
  • Loading branch information
Stu Freen authored Apr 4, 2023
1 parent 9b37c8d commit 1880145
Show file tree
Hide file tree
Showing 69 changed files with 1,463 additions and 1,342 deletions.
4 changes: 4 additions & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"printWidth": 120,
"singleQuote": true
}
2 changes: 1 addition & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
"recommendations": ["shopify.theme-check-vscode"]
"recommendations": ["shopify.theme-check-vscode", "esbenp.prettier-vscode"]
}
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"editor.formatOnSave": true
}
8 changes: 3 additions & 5 deletions assets/animations.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,15 @@ function onIntersection(elements, observer) {
if (element.isIntersecting) {
const elementTarget = element.target;
elementTarget.classList.add(SCROLL_ANIMATION_ACTIVE_CLASSNAME);
if (elementTarget.hasAttribute("data-cascade"))
if (elementTarget.hasAttribute('data-cascade'))
elementTarget.setAttribute('style', `--animation-order: ${index};`);
observer.unobserve(elementTarget);
}
})
});
}

function initializeScrollAnimationTrigger(rootEl = document) {
const animationTriggerElements = Array.from(
rootEl.getElementsByClassName(SCROLL_ANIMATION_TRIGGER_CLASSNAME)
);
const animationTriggerElements = Array.from(rootEl.getElementsByClassName(SCROLL_ANIMATION_TRIGGER_CLASSNAME));
if (animationTriggerElements.length === 0) return;

const observer = new IntersectionObserver(onIntersection, {
Expand Down
109 changes: 56 additions & 53 deletions assets/base.css
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ blockquote {

.caption-with-letter-spacing--medium {
font-size: 1.2rem;
letter-spacing: .16rem;
letter-spacing: 0.16rem;
}

.caption-with-letter-spacing--large {
Expand Down Expand Up @@ -774,7 +774,6 @@ details > * {
text-decoration-thickness: 0.2rem;
}


.icon-arrow {
width: 1.5rem;
}
Expand Down Expand Up @@ -860,17 +859,15 @@ summary::-webkit-details-marker {
*:focus-visible {
outline: 0.2rem solid rgba(var(--color-foreground), 0.5);
outline-offset: 0.3rem;
box-shadow: 0 0 0 0.3rem rgb(var(--color-background)),
0 0 0.5rem 0.4rem rgba(var(--color-foreground), 0.3);
box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0.5rem 0.4rem rgba(var(--color-foreground), 0.3);
}

/* Fallback - for browsers that don't support :focus-visible, a fallback is set for :focus */
.focused,
.no-js *:focus {
outline: 0.2rem solid rgba(var(--color-foreground), 0.5);
outline-offset: 0.3rem;
box-shadow: 0 0 0 0.3rem rgb(var(--color-background)),
0 0 0.5rem 0.4rem rgba(var(--color-foreground), 0.3);
box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0.5rem 0.4rem rgba(var(--color-foreground), 0.3);
}

/* Negate the fallback side-effect for browsers that support :focus-visible */
Expand Down Expand Up @@ -914,16 +911,14 @@ summary::-webkit-details-marker {
.focus-offset:focus-visible {
outline: 0.2rem solid rgba(var(--color-foreground), 0.5);
outline-offset: 1rem;
box-shadow: 0 0 0 1rem rgb(var(--color-background)),
0 0 0.2rem 1.2rem rgba(var(--color-foreground), 0.3);
box-shadow: 0 0 0 1rem rgb(var(--color-background)), 0 0 0.2rem 1.2rem rgba(var(--color-foreground), 0.3);
}

.focus-offset.focused,
.no-js .focus-offset:focus {
outline: 0.2rem solid rgba(var(--color-foreground), 0.5);
outline-offset: 1rem;
box-shadow: 0 0 0 1rem rgb(var(--color-background)),
0 0 0.2rem 1.2rem rgba(var(--color-foreground), 0.3);
box-shadow: 0 0 0 1rem rgb(var(--color-background)), 0 0 0.2rem 1.2rem rgba(var(--color-foreground), 0.3);
}

.no-js .focus-offset:focus:not(:focus-visible) {
Expand Down Expand Up @@ -1178,7 +1173,7 @@ summary::-webkit-details-marker {
max-width: calc(50% - var(--grid-desktop-horizontal-spacing) / 2);
}

.slider--desktop .scroll-trigger.animate--slide-in{
.slider--desktop .scroll-trigger.animate--slide-in {
animation: none;
opacity: 1;
}
Expand Down Expand Up @@ -1234,7 +1229,7 @@ summary::-webkit-details-marker {
}

.slider--tablet.grid--peek.grid--1-col-tablet-down .grid__item,
.slider--mobile.grid--peek.grid--1-col-tablet-down .grid__item {
.slider--mobile.grid--peek.grid--1-col-tablet-down .grid__item {
width: calc(100% - var(--grid-mobile-horizontal-spacing) - 3rem);
}
}
Expand Down Expand Up @@ -1341,7 +1336,7 @@ deferred-media {
.shopify-challenge__button,
.customer button,
button.shopify-payment-button__button--unbranded,
.shopify-payment-button [role="button"],
.shopify-payment-button [role='button'],
.cart__dynamic-checkout-buttons [role='button'],
.cart__dynamic-checkout-buttons iframe {
--shadow-horizontal-offset: var(--buttons-shadow-horizontal-offset);
Expand All @@ -1368,7 +1363,8 @@ button.shopify-payment-button__button--unbranded {
}

.cart__dynamic-checkout-buttons iframe {
box-shadow: var(--shadow-horizontal-offset) var(--shadow-vertical-offset) var(--shadow-blur-radius) rgba(var(--color-base-text), var(--shadow-opacity));
box-shadow: var(--shadow-horizontal-offset) var(--shadow-vertical-offset) var(--shadow-blur-radius)
rgba(var(--color-base-text), var(--shadow-opacity));
}

.button,
Expand All @@ -1394,7 +1390,7 @@ button.shopify-payment-button__button--unbranded {
.shopify-challenge__button:before,
.customer button:before,
.shopify-payment-button__button--unbranded:before,
.shopify-payment-button [role="button"]:before,
.shopify-payment-button [role='button']:before,
.cart__dynamic-checkout-buttons [role='button']:before {
content: '';
position: absolute;
Expand All @@ -1404,7 +1400,8 @@ button.shopify-payment-button__button--unbranded {
left: 0;
z-index: -1;
border-radius: var(--buttons-radius-outset);
box-shadow: var(--shadow-horizontal-offset) var(--shadow-vertical-offset) var(--shadow-blur-radius) rgba(var(--color-shadow), var(--shadow-opacity));
box-shadow: var(--shadow-horizontal-offset) var(--shadow-vertical-offset) var(--shadow-blur-radius)
rgba(var(--color-shadow), var(--shadow-opacity));
}

.button:after,
Expand All @@ -1419,7 +1416,8 @@ button.shopify-payment-button__button--unbranded {
left: var(--buttons-border-width);
z-index: 1;
border-radius: var(--buttons-radius);
box-shadow: 0 0 0 calc(var(--buttons-border-width) + var(--border-offset)) rgba(var(--color-button-text), var(--border-opacity)),
box-shadow: 0 0 0 calc(var(--buttons-border-width) + var(--border-offset))
rgba(var(--color-button-text), var(--border-opacity)),
0 0 0 var(--buttons-border-width) rgba(var(--color-button), var(--alpha-button-background));
transition: box-shadow var(--duration-short) ease;
}
Expand All @@ -1429,7 +1427,8 @@ button.shopify-payment-button__button--unbranded {
.customer button:hover::after,
.shopify-payment-button__button--unbranded:hover::after {
--border-offset: 1.3px;
box-shadow: 0 0 0 calc(var(--buttons-border-width) + var(--border-offset)) rgba(var(--color-button-text), var(--border-opacity)),
box-shadow: 0 0 0 calc(var(--buttons-border-width) + var(--border-offset))
rgba(var(--color-button-text), var(--border-opacity)),
0 0 0 calc(var(--buttons-border-width) + 1px) rgba(var(--color-button), var(--alpha-button-background));
}

Expand All @@ -1441,18 +1440,17 @@ button.shopify-payment-button__button--unbranded {
.button:focus,
.button.focused,
.shopify-payment-button__button--unbranded:focus-visible,
.shopify-payment-button [role="button"]:focus-visible,
.shopify-payment-button [role='button']:focus-visible,
.shopify-payment-button__button--unbranded:focus,
.shopify-payment-button [role="button"]:focus {
.shopify-payment-button [role='button']:focus {
outline: 0;
box-shadow: 0 0 0 0.3rem rgb(var(--color-background)),
0 0 0 0.5rem rgba(var(--color-foreground), 0.5),
box-shadow: 0 0 0 0.3rem rgb(var(--color-background)), 0 0 0 0.5rem rgba(var(--color-foreground), 0.5),
0 0 0.5rem 0.4rem rgba(var(--color-foreground), 0.3);
}

.button:focus:not(:focus-visible):not(.focused),
.shopify-payment-button__button--unbranded:focus:not(:focus-visible):not(.focused),
.shopify-payment-button [role="button"]:focus:not(:focus-visible):not(.focused) {
.shopify-payment-button [role='button']:focus:not(:focus-visible):not(.focused) {
box-shadow: inherit;
}

Expand Down Expand Up @@ -1610,7 +1608,8 @@ details[open] > .share-button__fallback {
bottom: 0;
left: 0;
border-radius: var(--inputs-radius-outset);
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset) var(--inputs-shadow-blur-radius) rgba(var(--color-base-text), var(--inputs-shadow-opacity));
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset)
var(--inputs-shadow-blur-radius) rgba(var(--color-base-text), var(--inputs-shadow-opacity));
z-index: -1;
}

Expand Down Expand Up @@ -1675,9 +1674,9 @@ details[open] > .share-button__fallback {

.share-button__fallback .field__input:focus,
.share-button__fallback .field__input:-webkit-autofill {
outline: 0.2rem solid rgba(var(--color-foreground),.5);
outline: 0.2rem solid rgba(var(--color-foreground), 0.5);
outline-offset: 0.1rem;
box-shadow: 0 0 0 0.1rem rgb(var(--color-background)),0 0 0.5rem 0.4rem rgba(var(--color-foreground),.3);
box-shadow: 0 0 0 0.1rem rgb(var(--color-background)), 0 0 0.5rem 0.4rem rgba(var(--color-foreground), 0.3);
}

.share-button__fallback .field__input {
Expand Down Expand Up @@ -1747,7 +1746,8 @@ details[open] > .share-button__fallback {
bottom: 0;
left: 0;
border-radius: var(--inputs-radius-outset);
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset) var(--inputs-shadow-blur-radius) rgba(var(--color-base-text), var(--inputs-shadow-opacity));
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset)
var(--inputs-shadow-blur-radius) rgba(var(--color-base-text), var(--inputs-shadow-opacity));
z-index: -1;
}

Expand Down Expand Up @@ -1784,7 +1784,8 @@ details[open] > .share-button__fallback {
.customer .field:hover.field:after,
.customer select:hover.select:after,
.localization-form__select:hover.localization-form__select:after {
box-shadow: 0 0 0 calc(0.1rem + var(--inputs-border-width)) rgba(var(--color-foreground),var(--inputs-border-opacity));
box-shadow: 0 0 0 calc(0.1rem + var(--inputs-border-width))
rgba(var(--color-foreground), var(--inputs-border-opacity));
outline: 0;
border-radius: var(--inputs-radius);
}
Expand Down Expand Up @@ -1875,8 +1876,7 @@ details[open] > .share-button__fallback {
margin-bottom: 0;
pointer-events: none;
position: absolute;
transition: top var(--duration-short) ease,
font-size var(--duration-short) ease;
transition: top var(--duration-short) ease, font-size var(--duration-short) ease;
color: rgba(var(--color-foreground), 0.75);
letter-spacing: 0.1rem;
line-height: 1.5;
Expand Down Expand Up @@ -2054,7 +2054,8 @@ input[type='checkbox'] {
bottom: 0;
left: 0;
border-radius: var(--inputs-radius-outset);
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset) var(--inputs-shadow-blur-radius) rgba(var(--color-base-text), var(--inputs-shadow-opacity));
box-shadow: var(--inputs-shadow-horizontal-offset) var(--inputs-shadow-vertical-offset)
var(--inputs-shadow-blur-radius) rgba(var(--color-base-text), var(--inputs-shadow-opacity));
z-index: -1;
}

Expand Down Expand Up @@ -2419,8 +2420,7 @@ product-info .loading-overlay:not(.hidden) ~ *,

.header--top-left.drawer-menu,
.header--middle-left.drawer-menu {
grid-template-areas:
'navigation heading icons';
grid-template-areas: 'navigation heading icons';
grid-template-columns: auto 1fr auto;
column-gap: 1rem;
}
Expand Down Expand Up @@ -2448,8 +2448,7 @@ product-info .loading-overlay:not(.hidden) ~ *,
}

.header--top-center.drawer-menu {
grid-template-areas:
'left-icons heading icons';
grid-template-areas: 'left-icons heading icons';
grid-template-columns: 1fr auto 1fr;
}

Expand Down Expand Up @@ -2601,8 +2600,8 @@ product-info .loading-overlay:not(.hidden) ~ *,
margin-right: -1.2rem;
}

.header__icon--menu[aria-expanded="true"]::before {
content: "";
.header__icon--menu[aria-expanded='true']::before {
content: '';
top: 100%;
left: 0;
height: calc(var(--viewport-height, 100vh) - (var(--header-bottom-position, 100%)));
Expand Down Expand Up @@ -2706,11 +2705,11 @@ details[open] .modal-overlay::after {
}

.search-modal__content-bottom {
bottom: calc((var(--inputs-margin-offset) / 2) );
bottom: calc((var(--inputs-margin-offset) / 2));
}

.search-modal__content-top {
top: calc((var(--inputs-margin-offset) / 2) );
top: calc((var(--inputs-margin-offset) / 2));
}

.search-modal__form {
Expand Down Expand Up @@ -2864,8 +2863,7 @@ details[open] > .header__menu-item .icon-caret {
}

.header__submenu {
transition: opacity var(--duration-default) ease,
transform var(--duration-default) ease;
transition: opacity var(--duration-default) ease, transform var(--duration-default) ease;
}

.global-settings-popup,
Expand All @@ -2874,7 +2872,8 @@ details[open] > .header__menu-item .icon-caret {
border-color: rgba(var(--color-foreground), var(--popup-border-opacity));
border-style: solid;
border-width: var(--popup-border-width);
box-shadow: var(--popup-shadow-horizontal-offset) var(--popup-shadow-vertical-offset) var(--popup-shadow-blur-radius) rgba(var(--color-shadow), var(--popup-shadow-opacity));
box-shadow: var(--popup-shadow-horizontal-offset) var(--popup-shadow-vertical-offset) var(--popup-shadow-blur-radius)
rgba(var(--color-shadow), var(--popup-shadow-opacity));
z-index: -1;
}

Expand Down Expand Up @@ -3005,10 +3004,8 @@ details-disclosure > details {
bottom: calc(var(--text-boxes-border-width) * -1);
left: calc(var(--text-boxes-border-width) * -1);
border-radius: var(--text-boxes-radius);
box-shadow: var(--text-boxes-shadow-horizontal-offset)
var(--text-boxes-shadow-vertical-offset)
var(--text-boxes-shadow-blur-radius)
rgba(var(--color-shadow), var(--text-boxes-shadow-opacity));
box-shadow: var(--text-boxes-shadow-horizontal-offset) var(--text-boxes-shadow-vertical-offset)
var(--text-boxes-shadow-blur-radius) rgba(var(--color-shadow), var(--text-boxes-shadow-opacity));
z-index: -1;
}

Expand Down Expand Up @@ -3045,7 +3042,8 @@ details-disclosure > details {
bottom: calc(var(--media-border-width) * -1);
left: calc(var(--media-border-width) * -1);
border-radius: var(--media-radius);
box-shadow: var(--media-shadow-horizontal-offset) var(--media-shadow-vertical-offset) var(--media-shadow-blur-radius) rgba(var(--color-shadow), var(--media-shadow-opacity));
box-shadow: var(--media-shadow-horizontal-offset) var(--media-shadow-vertical-offset) var(--media-shadow-blur-radius)
rgba(var(--color-shadow), var(--media-shadow-opacity));
z-index: -1;
pointer-events: none;
}
Expand Down Expand Up @@ -3135,9 +3133,9 @@ details-disclosure > details {
.button:focus,
.button.focused,
.shopify-payment-button__button--unbranded:focus-visible,
.shopify-payment-button [role="button"]:focus-visible,
.shopify-payment-button [role='button']:focus-visible,
.shopify-payment-button__button--unbranded:focus,
.shopify-payment-button [role="button"]:focus {
.shopify-payment-button [role='button']:focus {
outline: solid transparent 1px;
}

Expand Down Expand Up @@ -3184,7 +3182,8 @@ details-disclosure > details {
max-width: 100%;
border: var(--media-border-width) solid rgba(var(--color-foreground), var(--media-border-opacity));
border-radius: var(--media-radius);
box-shadow: var(--media-shadow-horizontal-offset) var(--media-shadow-vertical-offset) var(--media-shadow-blur-radius) rgba(var(--color-shadow), var(--media-shadow-opacity));
box-shadow: var(--media-shadow-horizontal-offset) var(--media-shadow-vertical-offset) var(--media-shadow-blur-radius)
rgba(var(--color-shadow), var(--media-shadow-opacity));
margin-bottom: var(--media-shadow-vertical-offset);
}

Expand Down Expand Up @@ -3231,7 +3230,7 @@ details-disclosure > details {
}

.shape--arch {
clip-path: url("#Shape-Arch");
clip-path: url('#Shape-Arch');
}

.shape--blob {
Expand Down Expand Up @@ -3271,8 +3270,12 @@ details-disclosure > details {
}

@keyframes animateAmbient {
0% { transform: rotate(0deg) translateX(1em) rotate(0deg) scale(1.2); }
100% { transform: rotate(360deg) translateX(1em) rotate(-360deg) scale(1.2); }
0% {
transform: rotate(0deg) translateX(1em) rotate(0deg) scale(1.2);
}
100% {
transform: rotate(360deg) translateX(1em) rotate(-360deg) scale(1.2);
}
}

.scroll-trigger.animate--fade-in,
Expand Down
Loading

0 comments on commit 1880145

Please sign in to comment.