Merge branch 'Shopify:main' into main

tairli · Aug 10, 2021 · b5ddb38 · b5ddb38
2 parents 358c4cd + d471454
commit b5ddb38
Show file tree

Hide file tree

Showing 42 changed files with 520 additions and 330 deletions.
diff --git a/assets/component-cart.css b/assets/component-cart.css
@@ -18,24 +18,36 @@ cart-items.is-empty .title-wrapper-with-link,
 .cart__warnings {
   display: none;
   text-align: center;
-  padding: 7rem 0;
+  padding: 3rem 0 1rem;
 }
 
 .cart__empty-text {
-  margin: 4.5rem 0 5.5rem;
+  margin: 4.5rem 0 2rem;
 }
 
 .cart__contents > * + * {
   margin-top: 2.5rem;
 }
 
+.cart__login-title {
+  margin: 5.5rem 0 0.5rem;
+}
+
+.cart__login-paragraph {
+  margin-top: 0.8rem;
+}
+
+.cart__login-paragraph a {
+  font-size: inherit;
+}
+
 @media screen and (min-width: 990px) {
   .cart__warnings {
-    padding: 10rem 0 15rem;
+    padding: 7rem 0 1rem;
   }
 
   .cart__empty-text {
-    margin: 5rem 0 6rem;
+    margin: 0 0 3rem;
   }
 }
 

diff --git a/assets/component-newsletter.css b/assets/component-newsletter.css
@@ -20,6 +20,10 @@
   width: 100%;
 }
 
+.newsletter-form__field-wrapper .field__input {
+  padding-right: 5rem;
+}
+
 .newsletter-form__message {
   justify-content: center;
   margin-bottom: 0;
@@ -42,12 +46,10 @@
 }
 
 .newsletter-form__button {
-  margin-left: 1.4rem;
+  width: 4.4rem;
+  margin: 0;
 }
 
-@media screen and (max-width: 989px) {
-  .newsletter-form__button {
-    width: 100%;
-    margin: 1.4rem 0 0 0;
-  }
+.newsletter-form__button .icon {
+  width: 1.5rem;
 }
diff --git a/assets/section-footer.css b/assets/section-footer.css
@@ -1,9 +1,12 @@
-.footer {
-  border-top: 0.1rem solid rgba(var(--color-foreground), 0.2);
-}
 
-.footer:not(.color-background-1) {
-  border-top: none;
+@media screen and (min-width: 750px) {
+  .footer {
+    border-top: 0.1rem solid rgba(var(--color-foreground), 0.2);
+  }
+
+  .footer:not(.color-background-1) {
+    border-top: none;
+  }
 }
 
 @media screen and (max-width: 749px) {
@@ -21,6 +24,11 @@
   .footer-block.grid__item:first-child {
     margin-top: 0;
   }
+
+  .footer__content-top {
+    padding-left: 4rem;
+    padding-right: 4rem;
+  }
 }
 
 .footer__content-top {
@@ -30,11 +38,6 @@
 }
 
 @media screen and (min-width: 750px) {
-  .footer__content-top {
-    padding-top: 7rem;
-    padding-bottom: 7rem;
-  }
-
   .footer__content-top .grid {
     margin-left: -3rem;
     row-gap: 6rem;
@@ -107,25 +110,12 @@
   }
 }
 
-.footer-block:only-child:last-child,
-.accordion:first-child + .footer-block:last-child {
+.footer-block:only-child:last-child {
   text-align: center;
   max-width: 76rem;
   margin: 0 auto;
 }
 
-.accordion:empty + .footer-block {
-  margin-top: 0;
-}
-
-.footer .accordion {
-  margin-top: 0;
-}
-
-.footer .small-hide + .accordion {
-  border-top: none;
-}
-
 @media screen and (min-width: 750px) {
   .footer-block {
     display: block;
@@ -142,7 +132,7 @@
   flex-wrap: wrap;
   justify-content: center;
   align-items: flex-end;
-  margin-top: 5rem;
+  margin-top: 2rem;
 }
 
 .footer-block--newsletter:only-child {
@@ -153,6 +143,12 @@
   flex: 1 1 100%;
 }
 
+@media screen and (max-width: 749px) {
+  .footer-block.footer-block--menu:only-child {
+    text-align: left;
+  }
+}
+
 @media screen and (min-width: 750px) {
   .footer-block--newsletter {
     flex-wrap: nowrap;
@@ -181,42 +177,27 @@
   justify-content: center;
 }
 
-.footer__list-social .list-social__item--placeholder:not(:only-child) {
-  display: none;
-}
-
 .footer-block__newsletter {
   text-align: center;
 }
 
-@media screen and (max-width: 749px) {
-  .footer-block__newsletter .newsletter-form__field-wrapper {
-    width: 30rem;
-  }
-}
-
-.footer-block__newsletter .newsletter-form__button.button {
-  width: fit-content;
+.newsletter-form__field-wrapper {
+  max-width: 36rem;
 }
 
 @media screen and (min-width: 750px) {
   .footer-block__newsletter:not(:only-child) {
     text-align: left;
   }
 
-  .footer-block__newsletter .newsletter-form__button.button {
-    margin-top: 0;
-    margin-left: 1.4rem;
-  }
-
   .footer-block__newsletter:not(:only-child) .footer__newsletter {
     justify-content: flex-start;
     margin: 0;
   }
 }
 
 .footer-block__newsletter + .footer__list-social {
-  margin-top: 5rem;
+  margin-top: 3rem;
 }
 
 @media screen and (max-width: 749px) {
@@ -405,12 +386,6 @@ noscript .localization-selector.link {
   opacity: 0.75;
 } */
 
-@media screen and (min-width: 750px) {
-  footer .accordion {
-    display: none;
-  }
-}
-
 @keyframes appear-down {
   0% {
     opacity: 0;
@@ -422,38 +397,20 @@ noscript .localization-selector.link {
   }
 }
 
-footer details[open] summary ~ * {
-  animation: appear-down var(--duration-default) ease;
-}
-
-.footer .accordion .list-menu__item--link {
-  justify-content: center;
-  text-align: center;
-}
-
 .footer-block__details-content {
   margin-bottom: 4rem;
 }
 
-.footer-block__details-content li:first-child .link {
-  padding-top: 3rem;
-}
-
 @media screen and (min-width: 750px) {
   .footer-block__details-content {
     margin-bottom: 0;
   }
 
-  .footer-block__details-content li:first-child .link {
-    padding-top: 0;
-  }
-
   .footer-block__details-content > p,
   .footer-block__details-content > li {
     padding: 0;
   }
 
-  .accordion:first-child + .footer-block:last-child li,
   .footer-block:only-child li {
     display: inline;
   }
@@ -490,7 +447,6 @@ footer details[open] summary ~ * {
   .footer-block__details-content .list-menu__item--link {
     padding-top: 1rem;
     padding-bottom: 1rem;
-    margin-top: 0.5rem;
   }
 }
 
@@ -502,7 +458,6 @@ footer details[open] summary ~ * {
 
   .footer-block__details-content > :first-child .list-menu__item--link {
     padding-top: 0;
-    margin-top: 0;
   }
 }