Merge remote-tracking branch 'mainline/2.4.1-develop' into 2.4.1-develop

Author: slavvka

app/code/Magento/ConfigurableProduct/view/adminhtml/web/template/variations/steps/summary-grid.html

@@ -5,14 +5,14 @@
  */
 -->
 
-<div class="admin__collapsible-block-wrapper opened">
-    <div class="fieldset-wrapper-title">
+<div class="fieldset-wrapper admin__collapsible-block-wrapper opened" data-bind="mageInit: {'collapsible':{'active':true,'openedState':'opened'}}">
+    <div class="fieldset-wrapper-title toggle" data-role="title">
         <strong class="admin__collapsible-title" data-toggle="collapse" data-bind="attr:{'data-target': '#'+id}">
             <span data-bind="text: title"></span>
         </strong>
     </div>
 
-    <div class="fieldset-wrapper-content in collapse" data-collapsed="true" data-bind="attr: {id: id}">
+    <div class="fieldset-wrapper-content in collapse" data-role="content" data-collapsed="true" data-bind="attr: {id: id}">
         <!-- ko template: {
             name: "ui/grid/paging/paging", data: paging
             } -->

app/code/Magento/Customer/Test/Mftf/Test/StorefrontLoginWithIncorrectCredentialsTest.xml

@@ -26,10 +26,14 @@
             <deleteData stepKey="deleteCustomer" createDataKey="customer" />
         </after>
 
-        <amOnPage stepKey="amOnSignInPage"  url="{{StorefrontCustomerSignInPage.url}}"/>
-        <fillField  stepKey="fillEmail" userInput="$$customer.email$$" selector="{{StorefrontCustomerSignInFormSection.emailField}}"/>
-        <fillField  stepKey="fillPassword" userInput="$$customer.password$$INVALID" selector="{{StorefrontCustomerSignInFormSection.passwordField}}"/>
-        <click stepKey="clickSignInAccountButton" selector="{{StorefrontCustomerSignInFormSection.signInAccountButton}}"/>
-        <see stepKey="seeErrorMessage" selector="{{StorefrontCustomerLoginMessagesSection.errorMessage}}" userInput="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later."/>
+        <actionGroup ref="StorefrontOpenCustomerLoginPageActionGroup" stepKey="goToSignInPage"/>
+        <actionGroup ref="StorefrontFillCustomerLoginFormWithWrongPasswordActionGroup" stepKey="fillLoginFormWithCustomerData">
+            <argument name="customer" value="$$customer$$"/>
+        </actionGroup>
+        <actionGroup ref="StorefrontClickSignOnCustomerLoginFormActionGroup" stepKey="clickSignInAccountButtonFirstAttempt"/>
+        <actionGroup ref="AssertMessageCustomerLoginActionGroup" stepKey="seeErrorMessageAfterFirstAttempt">
+            <argument name="messageType" value="error"/>
+            <argument name="message" value="The account sign-in was incorrect or your account is disabled temporarily. Please wait and try again later"/>
+        </actionGroup>
     </test>
 </tests>

app/code/Magento/SalesRule/Test/Mftf/ActionGroup/StorefrontClickOnMiniCartActionGroup.xml

@@ -122,11 +122,6 @@
                 &:before {
                     content: @icon-expand-close__content;
                 }
-                &.active {
-                    &:before {
-                        content: @icon-expand-open__content;
-                    }
-                }
             }
         }
 

app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less

@@ -414,8 +414,6 @@
             &:extend(.abs-blocks-2columns all);
             .login {
                 .actions-toolbar {
-                    margin-left: 0;
-
                     > .primary {
                         margin-bottom: 0;
                         margin-right: @indent__l;
@@ -430,19 +428,8 @@
 
         .fieldset {
             &:after {
-                margin-left: 0;
                 &:extend(.abs-margin-for-forms-desktop all);
             }
-
-            > .field {
-                > .control {
-                    width: 80%;
-                }
-
-                .label {
-                    text-align: left;
-                }
-            }
         }
     }
 

app/design/frontend/Magento/blank/Magento_Customer/web/css/source/_module.less

@@ -25,7 +25,8 @@
         .lib-link-as-button();
     }
 
-    .action.primary {
+    .action.primary,
+    .action-primary {
         .lib-button-primary();
     }
 }

app/design/frontend/Magento/blank/web/css/source/_buttons.less

@@ -17,7 +17,7 @@
 
     button {
         &:not(.primary) {
-            .lib-css(box-shadow, @button__shadow);
+            .lib-css(box-shadow, none);
 
             &:active {
                 .lib-css(box-shadow, @button__shadow-active);
@@ -39,7 +39,8 @@
         .lib-link-as-button();
     }
 
-    .action.primary {
+    .action.primary,
+    .action-primary {
         .lib-button-primary();
     }
 }