Merge branch 'release/2.11.0'

SnowdogApps · Dec 10, 2020 · fb86eb6 · fb86eb6 · vercel · Dec 10, 2020
2 parents e191646 + 1bbd7de
commit fb86eb6
Show file tree

Hide file tree

Showing 342 changed files with 6,652 additions and 10,320 deletions.
diff --git a/Amasty_Gdpr/templates/settings.phtml b/Amasty_Gdpr/templates/settings.phtml
@@ -30,7 +30,7 @@ $settings = $block->getPrivacySettings();
                     value="<?= $block->escapeHtmlAttr($block->getCurrentOderIncrementId()) ?>"
                 />
                 <p class="policy-content">
-                    <?= $block->escapeHtml($setting['content']) ?>
+                    <?= /* @noEscape */ $setting['content'] ?>
                 </p>
                 <?php if ($setting['hasCheckbox']): ?>
                     <div

diff --git a/Amasty_GdprCookie/layout/default.xml b/Amasty_GdprCookie/layout/default.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    layout="1column"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
+>
+    <body>
+        <referenceBlock name="head.additional">
+            <block
+              class="Magento\Framework\View\Element\Template"
+              name="amgdprcookie-styles"
+              template="Amasty_GdprCookie::amgdprcookie-styles.phtml"
+            />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/Amasty_GdprCookie/templates/amgdprcookie-styles.phtml b/Amasty_GdprCookie/templates/amgdprcookie-styles.phtml
@@ -0,0 +1,5 @@
+<link
+    href="<?= $this->getViewFileUrl('Amasty_GdprCookie::css/source/mkcss/amgdprcookie.min.css') ?>"
+    rel="stylesheet preload"
+    as="style"
+/>
diff --git a/Amasty_GdprCookie/templates/widget/settings.phtml b/Amasty_GdprCookie/templates/widget/settings.phtml
@@ -60,9 +60,9 @@ $groups = $block->getAllGroups();
                             <?= $groupData['isEssential'] ? 'disabled' : ''; ?>
                         "
                         type="checkbox"
-                        id="switchBox<?= $groupId ?>"
+                        id="switchBox<?= $block->escapeHtmlAttr($groupId) ?>"
                         name="groups[]"
-                        value="<?= $groupId ?>"
+                        value="<?= $block->escapeHtmlAttr($groupId) ?>"
                         data-category-id="1"
                         data-is-system="1"
                         <?= $groupData['checked'] ? 'checked' : ''; ?>
@@ -90,7 +90,7 @@ $groups = $block->getAllGroups();
                     </svg>
                     <label
                         class="checkbox__label"
-                        for="switchBox<?= $groupId ?>"
+                        for="switchBox<?= $block->escapeHtmlAttr($groupId) ?>"
                     >
                         <?= $block->escapeHtml(__('%1 Cookies', $groupData['name'])); ?>
                     </label>
@@ -115,7 +115,7 @@ $groups = $block->getAllGroups();
                                 <button
                                     class="dropdown-list__label"
                                     aria-expanded="false"
-                                    aria-controls="dropdown-detailed-content-<?= $groupId ?>"
+                                    aria-controls="dropdown-detailed-content-<?= $block->escapeHtmlAttr($groupId) ?>"
                                     type="button"
                                 >
                                     <?= $block->escapeHtml(__('List of cookies the %1 group collects', $groupData['name'])); ?>
@@ -130,7 +130,7 @@ $groups = $block->getAllGroups();
                                 </button>
 
                                 <div
-                                    id="dropdown-detailed-content-<?= $groupId ?>"
+                                    id="dropdown-detailed-content-<?= $block->escapeHtmlAttr($groupId) ?>"
                                     class="dropdown-list__content"
                                     aria-hidden="true"
                                 >

diff --git a/Amasty_GiftCard/layout/default.xml b/Amasty_GiftCard/layout/default.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    layout="1column"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
+>
+    <body>
+        <referenceBlock name="head.additional">
+            <block
+                class="Magento\Framework\View\Element\Template"
+                name="amgiftcard-styles"
+                template="Amasty_GiftCard::amgiftcard-styles.phtml"
+            />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/Amasty_GiftCard/templates/amgiftcard-styles.phtml b/Amasty_GiftCard/templates/amgiftcard-styles.phtml
@@ -0,0 +1,5 @@
+<link
+    href="<?= $this->getViewFileUrl('Amasty_GiftCard::css/source/mkcss/amgiftcard.css') ?>"
+    rel="stylesheet preload"
+    as="style"
+/>
diff --git a/Amasty_GiftCard/templates/checkout/cart/giftcard.phtml b/Amasty_GiftCard/templates/checkout/cart/giftcard.phtml
@@ -40,7 +40,7 @@
             aria-hidden="true"
         >
             <div
-                class="margin-top-m"
+                class="margin-top-s"
                 data-amgiftcard-js="amgiftcard-info">
             </div>
 
@@ -101,13 +101,13 @@
                     value="0"
                 />
 
-                <div class="cart-discount__controls">
+                <div class="cart-discount__controls padding-top-s">
                     <div class="input cart-discount__content-input">
                         <?php
                             $enterGiftCardLabel = __('Enter gift card code');
                         ?>
                         <label
-                            for="coupon_code"
+                            for="am_giftcard_code"
                             class="
                                 label
                                 label--hidden

diff --git a/Amasty_GiftCard/templates/customer/cardform.phtml b/Amasty_GiftCard/templates/customer/cardform.phtml
@@ -16,12 +16,23 @@
                 class="input required"
                 data-container="change-email"
             >
+                <label
+                    for="am_giftcard_code"
+                    class="
+                        label
+                        label--hidden
+                        input__label
+                    "
+                >
+                    <?= $block->escapeHtml(__('Enter gift card code')) ?>
+                </label>
                 <input
                     type="text"
                     class="input__field"
                     id="am_giftcard_code"
                     name="am_giftcard_code"
                     value=""
+                    required
                 />
             </div>
         </div>

diff --git a/Amasty_GiftCard/web/template/payment/gift-card.html b/Amasty_GiftCard/web/template/payment/gift-card.html
@@ -82,8 +82,11 @@
                 <!-- /ko -->
 
                 <div class="payment-option-inner">
-                    <div class="input">
-                        <label class="label" for="gift-code">
+                    <div class="input discount-code__input">
+                        <label
+                            class="label input__label"
+                            for="gift-code-fake"
+                        >
                             <span data-bind="i18n: 'Enter gift card code'"></span>
                         </label>
                         <input

diff --git a/Amasty_Storelocator/layout/default.xml b/Amasty_Storelocator/layout/default.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0"?>
+<page
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    layout="1column"
+    xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd"
+>
+    <head>
+        <remove src="Amasty_Storelocator::vendor/chosen/chosen.min.css" />
+    </head>
+    <body>
+        <referenceBlock name="head.additional">
+            <block class="Magento\Framework\View\Element\Template" name="amlocator-styles" template="Amasty_Storelocator::amlocator-styles.phtml" />
+        </referenceBlock>
+    </body>
+</page>
diff --git a/Amasty_Storelocator/templates/amlocator-styles.phtml b/Amasty_Storelocator/templates/amlocator-styles.phtml
@@ -0,0 +1,5 @@
+<link
+    href="<?= $this->getViewFileUrl('Amasty_Storelocator::css/source/mkcss/amlocator.css') ?>"
+    rel="stylesheet preload"
+    as="style"
+/>
diff --git a/Amasty_Storelocator/templates/link.phtml b/Amasty_Storelocator/templates/link.phtml
@@ -18,6 +18,7 @@ if ($block->getProduct()) {
             button--fluid
             button--secondary
             link--button
+            margin-bottom-l
         "
         href="<?= $block->escapeHtml($block->getLinkToMap(["product" => $productId])) ?>"
         <?= $block->escapeHtml($target) ?>

diff --git a/Amazon_Payment/web/template/form/element/email.html b/Amazon_Payment/web/template/form/element/email.html
@@ -8,7 +8,11 @@
 <!-- ko template: getTemplate() --><!-- /ko -->
 <!-- /ko -->
 <form
-    class="form form-login"
+    class="
+        form
+        form-login
+        shipping-address__form-login
+    "
     data-role="email-with-possible-login"
     data-bind="submit:login"
     method="post"
@@ -18,27 +22,36 @@
         class="fieldset"
         data-bind="blockLoader: isLoading"
     >
-        <div class="field required">
+        <div
+            class="
+                field
+                input
+                required
+            "
+        >
             <label
-                class="label"
+                class="label input__label"
                 for="customer-email"
             >
                 <span data-bind="i18n: 'Email Address'"></span>
             </label>
             <div class="control _with-tooltip">
                 <input
-                    class="input-text"
+                    class="input-text input__field"
                     type="email"
                     data-bind="
                         textInput: email,
                         hasFocus: emailFocused"
                     name="username"
-                    data-validate="{required:true, 'validate-email':true}"
+                    data-validate="{
+                        required: true,
+                        'validate-email':true
+                    }"
                     id="customer-email"
                 />
                 <!-- ko template: 'ui/form/element/helper/tooltip' --><!-- /ko -->
                 <span
-                    class="note"
+                    class="margin-top-xs note"
                     data-bind="fadeVisible: isPasswordVisible() == false"
                 >
                     <!-- ko i18n: 'You can create an account after checkout.'--><!-- /ko -->
@@ -51,32 +64,86 @@
             class="fieldset hidden-fields"
             data-bind="fadeVisible: isPasswordVisible"
         >
-            <div class="field">
+            <div
+                class="
+                    field
+                    input
+                    input--password
+                "
+            >
                 <label
-                    class="label"
+                    class="label input__label"
                     for="customer-password"
                 >
                     <span data-bind="i18n: 'Password'"></span>
                 </label>
                 <div class="control">
                     <input
-                        class="input-text"
+                        class="input-text input__field"
                         placeholder="optional"
                         type="password"
                         name="password"
                         id="customer-password"
-                        data-validate="{required:true}"
+                        data-validate="{ required: true }"
                         autocomplete="off"
+                        data-bind="attr:{ placeholder: $t('optional')}"
                     />
+                    <button
+                        type="button"
+                        class="
+                            button
+                            button--icon
+                            input__button-pass
+                        "
+                        data-bind='
+                            mageInit: { "passwordTrigger": {} },
+                            attr: {
+                                "aria-label": $t("Show/hide password")
+                            }
+                        '
+                    >
+                        <svg
+                            class="
+                                icon
+                                icon--secondary
+                                input__button-pass-icon-view
+                            "
+                            role="presentation"
+                            focusable="false"
+                        >
+                            <use
+                                data-bind="attr: { 'xlink:href': require.toUrl('images/icons-sprite.svg#visibility-off') }"
+                                xlink:href=''
+                            ></use>
+                        </svg>
+
+                        <svg
+                            class="
+                                icon
+                                icon--secondary
+                                input__button-pass-icon-hide
+                            "
+                            role="presentation"
+                            focusable="false"
+                        >
+                            <use
+                                data-bind="attr: { 'xlink:href': require.toUrl('images/icons-sprite.svg#visibility') }"
+                                xlink:href=''
+                            ></use>
+                        </svg>
+                    </button>
                     <span
-                        class="note"
+                        class="
+                            note
+                            customer-note
+                        "
                         data-bind="i18n: 'You already have an account with us. Sign in or continue as guest.'"
                     ></span>
                 </div>
 
             </div>
             <!-- ko foreach: getRegion('additional-login-form-fields') -->
-            <!-- ko template: getTemplate() --><!-- /ko -->
+                <!-- ko template: getTemplate() --><!-- /ko -->
             <!-- /ko -->
             <div
                 class="

diff --git a/AuthorizeNet_CreditCard/web/template/payment/form.html b/AuthorizeNet_CreditCard/web/template/payment/form.html
@@ -20,6 +20,7 @@
                 click: selectPaymentMethod,
                 visible: isRadioButtonVisible()
             "
+            aria-labelledby="payment-info-label"
         />
         <label
             class="label"