Merge branch 'master' into BCTHEME-1750

CHANGELOG.md

@@ -5,11 +5,18 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## Draft
+- Check lang helpers usage and existence of key in translation file [#2403](https://github.com/bigcommerce/cornerstone/pull/2403)
 - Display fees on cart page [#2376](https://github.com/bigcommerce/cornerstone/pull/2376)
 - Replace Twitter logo with X logo within social sharing and social link components [#2387](https://github.com/bigcommerce/cornerstone/pull/2387)
 - Added nvm config [#2389](https://github.com/bigcommerce/cornerstone/pull/2389)
 - Displaying the Hidden cart_order_source Input Field on PDP page [#2392](https://github.com/bigcommerce/cornerstone/pull/2392)
 - Update Shop By Price Widget [#2408](https://github.com/bigcommerce/cornerstone/pull/2408)
+- 'Please Select a file' popup forces shopper to re-upload file if the option type is 'File Upload' and is set to required [#2409](https://github.com/bigcommerce/cornerstone/pull/2409)
+- Top Global Region Image Widget overlaps the mobile menu [#2402](https://github.com/bigcommerce/cornerstone/pull/2402)
+- Changed default PayPal checkout button color [#2405](https://github.com/bigcommerce/cornerstone/pull/2405)
+- Changed default PayPal checkout button size [#2406](https://github.com/bigcommerce/cornerstone/pull/2406)
+- Change case of Page builder menu item text [#2407](https://github.com/bigcommerce/cornerstone/pull/2407)
+- Corrected typo with the word default previously deafault in config.json [#2410](https://github.com/bigcommerce/cornerstone/pull/2410)
 
 ## 6.12.0 (07-06-2023)
 - sync package lock file [#2373](https://github.com/bigcommerce/cornerstone/pull/2373)

assets/scss/components/foundation/alerts/_alerts.scss

@@ -14,7 +14,7 @@
 }
 
 .alertBox--info {
-    background-color: stencilColor("banner--deafault-backgroundColor");
+    background-color: stencilColor("banner--default-backgroundColor");
     color: stencilColor("alert-color-alt");
 
     .alertBox-close {

assets/scss/components/stencil/navPages/_navPages.scss

@@ -56,7 +56,6 @@
     &.is-open {
         display: block;
         padding-top: $header-height;
-        z-index: 0;
     }
 }
 

config.json

@@ -149,7 +149,7 @@
     "color-greyLight": "#999999",
     "color-greyLighter": "#cccccc",
     "color-greyLightest": "#e5e5e5",
-    "banner--deafault-backgroundColor": "#707070",
+    "banner--default-backgroundColor": "#707070",
     "button--default-color": "#666666",
     "button--default-colorHover": "#333333",
     "button--default-colorActive": "#000000",
@@ -331,14 +331,14 @@
     "paymentbuttons-paypal-checkout-on-top-color": "gold",
     "paymentbuttons-paylater-checkout-on-top-color": "gold",
     "paymentbuttons-venmo-checkout-on-top-color": "blue",
-    "paymentbuttons-paypal-checkout-payment-color": "gold",
+    "paymentbuttons-paypal-checkout-payment-color": "black",
     "paymentbuttons-paylater-checkout-payment-color": "gold",
     "paymentbuttons-venmo-checkout-payment-color": "blue",
     "paymentbuttons-paypal-checkout-payment-label": "checkout",
     "paymentbuttons-paypal-checkout-on-top-payment-label": "checkout",
     "paymentbuttons-paypal-cart-page-add-cart-label": "checkout",
     "paymentbuttons-paypal-product-details-page-label": "checkout",
-    "paymentbuttons-paypal-checkout-payment-size": "medium",
+    "paymentbuttons-paypal-checkout-payment-size": "large",
     "paymentbuttons-paypal-color": "gold",
     "paymentbuttons-paypal-shape": "rect",
     "paymentbuttons-paypal-label": "checkout",
@@ -474,7 +474,7 @@
         "color-greyLight": "#757575",
         "color-greyLighter": "#666666",
         "color-greyLightest": "#444444",
-        "banner--deafault-backgroundColor": "#b7b4b4",
+        "banner--default-backgroundColor": "#b7b4b4",
         "button--default-color": "#cccccc",
         "button--default-colorHover": "#ffffff",
         "button--default-colorActive": "#ffffff",
@@ -684,7 +684,7 @@
         "color-greyLight": "#a5a5a5",
         "color-greyLighter": "#dfdfdf",
         "color-greyLightest": "#e8e8e8",
-        "banner--deafault-backgroundColor": "#7D644A",
+        "banner--default-backgroundColor": "#7D644A",
         "button--default-color": "#74685c",
         "button--default-colorHover": "#4f3f2f",
         "button--default-colorActive": "#917052",

schemaTranslations.json

@@ -1296,7 +1296,7 @@
     "pl": "Granica pola aktywna"
   },
   "i18n.HeaderAndFooter": {
-    "default": "Header & Footer",
+    "default": "Header and footer",
     "fr": "En-tête et pied de page",
     "it": "Intestazione e piè di pagina",
     "zh": "页眉和页脚",
@@ -2214,7 +2214,7 @@
     "pl": "Mała"
   },
   "i18n.HomePage": {
-    "default": "Home Page",
+    "default": "Homepage",
     "fr": "Page d'accueil",
     "it": "Homepage",
     "zh": "主页",
@@ -3546,7 +3546,7 @@
     "pl": "Standard"
   },
   "i18n.ButtonsAndIcons": {
-    "default": "Buttons & Icons",
+    "default": "Buttons and icons",
     "fr": "Boutons et icônes",
     "it": "Pulsanti e icone",
     "zh": "按钮与图标",
@@ -3924,7 +3924,7 @@
     "pl": "Pole wyboru i ikona radia"
   },
   "i18n.CheckoutPage": {
-    "default": "Checkout Page",
+    "default": "Checkout page",
     "fr": "Page de paiement",
     "it": "Pagina di checkout",
     "zh": "结账台页面",
@@ -4734,7 +4734,7 @@
     "pl": "Kolor tekstu tostów"
   },
   "i18n.PaymentButtons": {
-    "default": "Payment Buttons",
+    "default": "Payment buttons",
     "fr": "Boutons de paiement",
     "it": "Pulsanti di pagamento",
     "zh": "付款按钮",
@@ -5508,7 +5508,7 @@
     "pl": "Brak"
   },
   "i18n.PaymentBanners": {
-    "default": "Payment Banners",
+    "default": "Payment banners",
     "fr": "Bannières de paiement",
     "it": "Banner di pagamento",
     "zh": "付款横幅",

templates/components/cart/modals/configure-product.html

@@ -1,7 +1,7 @@
 <div class="modal-header">
-    <h2 
-        class="modal-header-title" 
-        data-product-variant 
+    <h2
+        class="modal-header-title"
+        data-product-variant
         data-name="{{product_name}}"
         >
         {{lang 'cart.reconfigure_product' name=product_name}}

templates/components/products/options/input-file.html

@@ -5,7 +5,13 @@
         {{> components/common/requireness-msg}}
     </label>
 
-    <input class="form-file" type="file" id="attribute_file_{{id}}" name="attribute[{{this.id}}]" {{#if required}}required{{/if}}>
+    <input
+        class="form-file"
+        type="file"
+        id="attribute_file_{{id}}"
+        name="attribute[{{this.id}}]"
+        {{#and required (unless prefill)}}required{{/and}}
+    >
     {{#if original_name}}
         {{{lang 'products.file_option_set' url=file_url name=original_name}}}
         <label>{{lang 'cart.remove_file'}}<input type="checkbox" name="{{file_remove}}"></label>
@@ -19,5 +25,4 @@
             {{lang 'products.filetypes'}} <strong>{{file_types}}</strong>
         {{/if}}
     </p>
-
 </div>