Merge tag '6.2.0' into cornerstone-update-6.2.0

sacred-art · Sep 29, 2023 · c472f7f · c472f7f
2 parents 20ea078 + 0e132e8
commit c472f7f
Show file tree

Hide file tree

Showing 44 changed files with 4,445 additions and 1,018 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Draft
 
+## 6.2.0 (12-13-2021)
+- Fix tooltip on close button of modal is shifted. [#2148](https://github.com/bigcommerce/cornerstone/pull/2148)
+- Optimized usage of jsTree library. [#2145](https://github.com/bigcommerce/cornerstone/pull/2145)
+- Replace schema microdata with LD+JSON tag. [#2138](https://github.com/bigcommerce/cornerstone/pull/2138)
+- Translation Gap: Checkbox Option selection on Product. [#2063](https://github.com/bigcommerce/cornerstone/pull/2063)
+- Admin Bar displays regardless of setting. [#2144](https://github.com/bigcommerce/cornerstone/pull/2144)
+- Fix Loading unnecessary product lqip images on cart page. [#2149](https://github.com/bigcommerce/cornerstone/pull/2149)
+- Translation updates November 2021. [#2146](https://github.com/bigcommerce/cornerstone/pull/2146)
+
 ## 6.1.3 (11-10-2021)
 - Cannot see currency dropdown in storefront. [#2141](https://github.com/bigcommerce/cornerstone/pull/2141)
 

diff --git a/assets/js/theme/global.js b/assets/js/theme/global.js
@@ -19,16 +19,7 @@ import svgInjector from './global/svg-injector';
 export default class Global extends PageManager {
     onReady() {
         const {
-            channelId,
-            cartId,
-            productId,
-            categoryId,
-            secureBaseUrl,
-            maintenanceModeSettings,
-            adminBarLanguage,
-            showAdminBar,
-            isProductCardPresented,
-            isProductListPresented,
+            channelId, cartId, productId, categoryId, secureBaseUrl, maintenanceModeSettings, adminBarLanguage,
         } = this.context;
         cartPreview(secureBaseUrl, cartId);
         quickSearch();
@@ -39,9 +30,7 @@ export default class Global extends PageManager {
         menu();
         mobileMenuToggle();
         privacyCookieNotification();
-        if (showAdminBar) {
-            adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
-        }
+        adminBar(secureBaseUrl, channelId, maintenanceModeSettings, JSON.parse(adminBarLanguage), productId, categoryId);
         loadingProgressBar();
         svgInjector();
     }

diff --git a/assets/scss/components/citadel/cards/_cards.scss b/assets/scss/components/citadel/cards/_cards.scss
@@ -40,6 +40,11 @@
             }
         }
     }
+
+    &__link {
+        display: block;
+        position: relative;
+    }
 }
 
 .card-figure {

diff --git a/assets/scss/components/foundation/modal/_modal.scss b/assets/scss/components/foundation/modal/_modal.scss
@@ -68,7 +68,8 @@
     }
 
     &::after {
-        right: calc(50% - remCalc(10px));
+        right: 50%;
+        transform: translateX(remCalc(10px));
     }
 }
 

diff --git a/assets/scss/components/stencil/cart/_cart.scss b/assets/scss/components/stencil/cart/_cart.scss
@@ -279,6 +279,10 @@ $card-preview-zoom-bottom-offset:       6rem;
         display: inline-block;
     }
 
+    &__label {
+        display: inline-block;
+    }
+
     + .definitionList {
         margin-top: spacing("quarter");
     }

diff --git a/assets/scss/components/stencil/heroCarousel/_heroCarousel.scss b/assets/scss/components/stencil/heroCarousel/_heroCarousel.scss
@@ -243,6 +243,36 @@
             }
         }
     }
+
+    .slick-slide {
+        &.is-square-image-type {
+            .heroCarousel-image-wrapper {
+                height: 100vw;
+            }
+        }
+
+        &.is-vertical-image-type {
+            .heroCarousel-image-wrapper {
+                height: 110vw;
+            }
+        }
+
+        &.is-square-image-type,
+        &.is-vertical-image-type {
+            .heroCarousel-image-wrapper {
+                @include breakpoint("small") {
+                    height: 56.25vw;
+                }
+            }
+        }
+
+        &.is-image-error {
+            .heroCarousel-image-wrapper {
+                background: url("../img/hero-carousel-image-load-error.svg") center center no-repeat;
+                background-size: contain;    
+            }
+        }
+    }
 }
 
 .heroCarousel-slide {

diff --git a/assets/scss/components/stencil/navPages/_navPages.scss b/assets/scss/components/stencil/navPages/_navPages.scss
@@ -245,6 +245,24 @@
         }
     }
 
+    &.is-open,
+    .collapsible-icon-wrapper.is-open {
+        svg {
+            fill: $navPage-subMenu-item--is-highlighted-color;
+            stroke: $navPage-subMenu-item--is-highlighted-color;
+        }
+    }
+
+    &:hover,
+    &.activePage {
+        color: $navPage-subMenu-item--is-highlighted-color;
+
+        svg {
+            fill: $navPage-subMenu-item--is-highlighted-color;
+            stroke: $navPage-subMenu-item--is-highlighted-color;
+        }
+    }
+
     // turn a highlight into a button
     &.highlightPage {
         background-color: black;

diff --git a/assets/scss/components/stencil/productView/_productView.scss b/assets/scss/components/stencil/productView/_productView.scss
@@ -274,6 +274,10 @@
         color: stencilColor("color-textSecondary--hover");
     }
 
+    &:hover {
+        color: stencilColor("color-textSecondary--hover");
+    }
+
     &--new {
         padding: 0;
     }
@@ -429,18 +433,6 @@
                 width: auto;
             }
 
-            @include breakpoint("medium") {
-                width: auto;
-            }
-
-            @include breakpoint("medium") {
-                width: auto;
-            }
-
-            @include breakpoint("medium") {
-                width: auto;
-            }
-
             @include breakpoint("large") {
                 margin-right: spacing("half");
             }
@@ -461,6 +453,10 @@
         .button--primary {
             margin-right: spacing("half");
         }
+
+        .button--primary {
+            margin-right: spacing("half");
+        }
     }
 }
 

diff --git a/assets/scss/layouts/products/_productSaleBadges.scss b/assets/scss/layouts/products/_productSaleBadges.scss
@@ -201,6 +201,10 @@
     background: stencilColor("color_hover_product_sold_out_badges");
 }
 
+.product:hover .sold-out-flag-sash {
+    background: stencilColor("color_hover_product_sold_out_badges");
+}
+
 .product {
     overflow: hidden;
 }
diff --git a/assets/scss/theme.scss b/assets/scss/theme.scss
@@ -83,5 +83,3 @@
 // -----------------------------------------------------------------------------
 
 @import "layouts/layouts"; // 1
-
-@import "vendor/jstree/style";
diff --git a/assets/scss/vendor/jstree/style.scss → assets/scss/vendor/jstree/style.css b/assets/scss/vendor/jstree/style.scss → assets/scss/vendor/jstree/style.css
@@ -471,7 +471,7 @@
 
 .jstree-default .jstree-node,
 .jstree-default .jstree-icon {
-    background-image: url("../img/vendor/jstree/32px.png");
+    background-image: url("/assets/img/vendor/jstree/32px.png");
 }
 
 .jstree-default .jstree-node {
@@ -606,15 +606,15 @@
 }
 
 .jstree-default > .jstree-container-ul .jstree-loading > .jstree-ocl {
-    background: url("../img/vendor/jstree/throbber.gif") center center no-repeat;
+    background: url("/assets/img/vendor/jstree/throbber.gif") center center no-repeat;
 }
 
 .jstree-default .jstree-file {
-    background: url("../img/vendor/jstree/32px.png") -100px -68px no-repeat;
+    background: url("/assets/img/vendor/jstree/32px.png") -100px -68px no-repeat;
 }
 
 .jstree-default .jstree-folder {
-    background: url("../img/vendor/jstree/32px.png") -260px -4px no-repeat;
+    background: url("/assets/img/vendor/jstree/32px.png") -260px -4px no-repeat;
 }
 
 .jstree-default > .jstree-container-ul > .jstree-node {
@@ -630,7 +630,7 @@
 #jstree-dnd.jstree-default .jstree-ok,
 #jstree-dnd.jstree-default .jstree-er {
     background-color: transparent;
-    background-image: url("../img/vendor/jstree/32px.png");
+    background-image: url("/assets/img/vendor/jstree/32px.png");
     background-repeat: no-repeat;
 }
 
@@ -691,7 +691,7 @@
 
 .jstree-default-small .jstree-node,
 .jstree-default-small .jstree-icon {
-    background-image: url("../img/vendor/jstree/32px.png");
+    background-image: url("/assets/img/vendor/jstree/32px.png");
 }
 
 .jstree-default-small .jstree-node {
@@ -826,15 +826,15 @@
 }
 
 .jstree-default-small > .jstree-container-ul .jstree-loading > .jstree-ocl {
-    background: url("../img/vendor/jstree/throbber.gif") center center no-repeat;
+    background: url("/assets/img/vendor/jstree/throbber.gif") center center no-repeat;
 }
 
 .jstree-default-small .jstree-file {
-    background: url("../img/vendor/jstree/32px.png") -103px -71px no-repeat;
+    background: url("/assets/img/vendor/jstree/32px.png") -103px -71px no-repeat;
 }
 
 .jstree-default-small .jstree-folder {
-    background: url("../img/vendor/jstree/32px.png") -263px -7px no-repeat;
+    background: url("/assets/img/vendor/jstree/32px.png") -263px -7px no-repeat;
 }
 
 .jstree-default-small > .jstree-container-ul > .jstree-node {
@@ -850,7 +850,7 @@
 #jstree-dnd.jstree-default-small .jstree-ok,
 #jstree-dnd.jstree-default-small .jstree-er {
     background-color: transparent;
-    background-image: url("../img/vendor/jstree/32px.png");
+    background-image: url("/assets/img/vendor/jstree/32px.png");
     background-repeat: no-repeat;
 }
 
@@ -911,7 +911,7 @@
 
 .jstree-default-large .jstree-node,
 .jstree-default-large .jstree-icon {
-    background-image: url("../img/vendor/jstree/32px.png");
+    background-image: url("/assets/img/vendor/jstree/32px.png");
 }
 
 .jstree-default-large .jstree-node {
@@ -1046,15 +1046,15 @@
 }
 
 .jstree-default-large > .jstree-container-ul .jstree-loading > .jstree-ocl {
-    background: url("../img/vendor/jstree/throbber.gif") center center no-repeat;
+    background: url("/assets/img/vendor/jstree/throbber.gif") center center no-repeat;
 }
 
 .jstree-default-large .jstree-file {
-    background: url("../img/vendor/jstree/32px.png") -96px -64px no-repeat;
+    background: url("/assets/img/vendor/jstree/32px.png") -96px -64px no-repeat;
 }
 
 .jstree-default-large .jstree-folder {
-    background: url("../img/vendor/jstree/32px.png") -256px 0 no-repeat;
+    background: url("/assets/img/vendor/jstree/32px.png") -256px 0 no-repeat;
 }
 
 .jstree-default-large > .jstree-container-ul > .jstree-node {
@@ -1070,7 +1070,7 @@
 #jstree-dnd.jstree-default-large .jstree-ok,
 #jstree-dnd.jstree-default-large .jstree-er {
     background-color: transparent;
-    background-image: url("../img/vendor/jstree/32px.png");
+    background-image: url("/assets/img/vendor/jstree/32px.png");
     background-repeat: no-repeat;
 }
 
@@ -1111,13 +1111,13 @@
     }
 
     #jstree-dnd.jstree-dnd-responsive > .jstree-ok {
-        background-image: url("../img/vendor/jstree/40px.png");
+        background-image: url("/assets/img/vendor/jstree/40px.png");
         background-position: 0 -200px;
         background-size: 120px 240px;
     }
 
     #jstree-dnd.jstree-dnd-responsive > .jstree-er {
-        background-image: url("../img/vendor/jstree/40px.png");
+        background-image: url("/assets/img/vendor/jstree/40px.png");
         background-position: -40px -200px;
         background-size: 120px 240px;
     }
@@ -1131,7 +1131,7 @@
 }
 @media (max-width: 768px) {
     .jstree-default-responsive .jstree-icon {
-        background-image: url("../img/vendor/jstree/40px.png");
+        background-image: url("/assets/img/vendor/jstree/40px.png");
     }
 
     .jstree-default-responsive .jstree-node,
@@ -1258,7 +1258,7 @@
     .jstree-default-responsive .jstree-node > .jstree-ocl,
     .jstree-default-responsive .jstree-themeicon,
     .jstree-default-responsive .jstree-checkbox {
-        background-image: url("../img/vendor/jstree/40px.png");
+        background-image: url("/assets/img/vendor/jstree/40px.png");
         background-size: 120px 240px;
     }
 
@@ -1286,12 +1286,12 @@
     }
 
     .jstree-default-responsive .jstree-file {
-        background: url("../img/vendor/jstree/40px.png") 0 -160px no-repeat;
+        background: url("/assets/img/vendor/jstree/40px.png") 0 -160px no-repeat;
         background-size: 120px 240px;
     }
 
     .jstree-default-responsive .jstree-folder {
-        background: url("../img/vendor/jstree/40px.png") -40px -40px no-repeat;
+        background: url("/assets/img/vendor/jstree/40px.png") -40px -40px no-repeat;
         background-size: 120px 240px;
     }
 

diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
   "name": "Midwest Nice",
-  "version": "6.1.3",
+  "version": "6.2.0",
   "template_engine": "handlebars_v4",
   "meta": {
     "price": 0,
@@ -386,7 +386,6 @@
       "paypal"
     ],
     "lazyload_mode": "lazyload+lqip",
-    "show-admin-bar": true,
     "checkout-paymentbuttons-paypal-color": "black",
     "checkout-paymentbuttons-paypal-shape": "rect",
     "checkout-paymentbuttons-paypal-size": "large",