Merge branch 'MC-15993' into Performance-PR-2.3.2

Author: vzabaznov

app/code/Magento/Search/view/frontend/templates/form.mini.phtml

@@ -16,31 +16,26 @@ $helper = $this->helper(\Magento\Search\Helper\Data::class);
     <div class="block block-content">
         <form class="form minisearch" id="search_mini_form" action="<?= /* @escapeNotVerified */ $helper->getResultUrl() ?>" method="get">
             <div class="field search">
+                <label class="label" for="search" data-role="minisearch-label">
+                    <span><?= /* @escapeNotVerified */ __('Search') ?></span>
+                </label>
                 <div class="control">
-                    <label for="search" data-role="minisearch-label">
-                        <span class="label">
-                            <?= /* @escapeNotVerified */ __('Search') ?>
-                        </span>
-                        <input
-                            aria-expanded="false"
-                            id="search"
-                            data-mage-init='{"quickSearch":{
+                    <input id="search"
+                           data-mage-init='{"quickSearch":{
                                 "formSelector":"#search_mini_form",
                                 "url":"<?= /* @escapeNotVerified */ $helper->getSuggestUrl()?>",
                                 "destinationSelector":"#search_autocomplete"}
-                                }'
-                            type="text"
-                            name="<?= /* @escapeNotVerified */ $helper->getQueryParamName() ?>"
-                            value="<?= /* @escapeNotVerified */ $helper->getEscapedQueryText() ?>"
-                            placeholder="<?= /* @escapeNotVerified */ __('Search entire store here...') ?>"
-                            class="input-text"
-                            maxlength="<?= /* @escapeNotVerified */ $helper->getMaxQueryLength() ?>"
-                            role="combobox"
-                            aria-haspopup="false"
-                            aria-autocomplete="both"
-                            autocomplete="off"
-                        />
-                    </label>
+                           }'
+                           type="text"
+                           name="<?= /* @escapeNotVerified */ $helper->getQueryParamName() ?>"
+                           value="<?= /* @escapeNotVerified */ $helper->getEscapedQueryText() ?>"
+                           placeholder="<?= /* @escapeNotVerified */ __('Search entire store here...') ?>"
+                           class="input-text"
+                           maxlength="<?= /* @escapeNotVerified */ $helper->getMaxQueryLength() ?>"
+                           role="combobox"
+                           aria-haspopup="false"
+                           aria-autocomplete="both"
+                           autocomplete="off"/>
                     <div id="search_autocomplete" class="search-autocomplete"></div>
                     <?= $block->getChildHtml() ?>
                 </div>