From b7400ded5d9b536e75f64f2835fd99b15acfa2e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Mon, 22 Oct 2018 19:31:17 +0200
Subject: [PATCH 01/69] #46308 - Update category filter classes

---
 .../templates/navigation/categories.phtml     | 52 ++++++++++---------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/Snowdog_SolrNavigation/templates/navigation/categories.phtml b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
index e11246af9..ec2fbe3b4 100644
--- a/Snowdog_SolrNavigation/templates/navigation/categories.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
@@ -25,39 +25,43 @@ $subCategories = $block->getSubCategories(2)
             data-content="checkbox"
             aria-hidden="true"
         >
-            <ul class="list filters__category-list">
+            <ul class="list filter__category-list">
                 <?php foreach ($subCategories as $id => $subCategory): ?>
-                    <li class="list__item">
+                    <li class="list__item filter__category-item">
                         <a
-                            class="filters__link"
+                            class="link filter__category-link"
                             href="<?= $block->getCategoryUrl($id) ?>"
                             title="<?= $subCategory['name'] ?>"
                         >
                             <?= $subCategory['name'] ?>
                         </a>
                         <?php if ($subCategory['child']): ?>
-                            <ul class="list list--nested">
+                            <ul class="list filter__category-list--nested">
                                 <?php foreach ($subCategory['child'] as $id => $item): ?>
-                                    <a
-                                        class="filters__link"
-                                        href="<?= $block->getCategoryUrl($id) ?>"
-                                        title="<?= $item['name'] ?>"
-                                    >
-                                        <?= $item['name'] ?>
-                                    </a>
-                                    <?php if ($item['child']): ?>
-                                        <ul class="list list--nested">
-                                            <?php foreach ($item['child'] as $id => $item): ?>
-                                                <a
-                                                    class="filters__link"
-                                                    href="<?= $block->getCategoryUrl($id) ?>"
-                                                    title="<?= $item['name'] ?>"
-                                                >
-                                                    <?= $item['name'] ?>
-                                                </a>
-                                            <?php endforeach ?>
-                                        </ul>
-                                    <?php endif ?>
+                                    <li class="filter__category-item">
+                                        <a
+                                            class="link filter__category-link"
+                                            href="<?= $block->getCategoryUrl($id) ?>"
+                                            title="<?= $item['name'] ?>"
+                                        >
+                                            <?= $item['name'] ?>
+                                        </a>
+                                        <?php if ($item['child']): ?>
+                                            <ul class="list filter__category-list--nested-second-level">
+                                                <?php foreach ($item['child'] as $id => $item): ?>
+                                                    <li class="filter__category-item">
+                                                        <a
+                                                            class="link filter__category-link"
+                                                            href="<?= $block->getCategoryUrl($id) ?>"
+                                                            title="<?= $item['name'] ?>"
+                                                        >
+                                                            <?= $item['name'] ?>
+                                                        </a>
+                                                    </li>
+                                                <?php endforeach ?>
+                                            </ul>
+                                        <?php endif ?>
+                                    </li>
                                 <?php endforeach ?>
                             </ul>
                         <?php endif ?>

From f79199a707c90513259e1e195bf43799294f62df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 21 Nov 2018 16:10:24 +0100
Subject: [PATCH 02/69] #46308 - Change filters content structure to  ul > li >
 a

---
 .../templates/product/layered/renderer.phtml  | 118 ++++++++++--------
 .../templates/navigation/list.phtml           |  44 ++++---
 .../templates/navigation/visual_swatch.phtml  |  71 ++++++-----
 3 files changed, 125 insertions(+), 108 deletions(-)

diff --git a/Magento_Swatches/templates/product/layered/renderer.phtml b/Magento_Swatches/templates/product/layered/renderer.phtml
index 74032e2fd..bf71eeedc 100644
--- a/Magento_Swatches/templates/product/layered/renderer.phtml
+++ b/Magento_Swatches/templates/product/layered/renderer.phtml
@@ -1,25 +1,27 @@
 <?php $swatchData = $block->getSwatchData(); ?>
-<div
+<ul
     attribute-code="<?= $swatchData['attribute_code'] ?>"
     attribute-id="<?= $swatchData['attribute_id'] ?>"
-    class="filter__swatch-wrapper"
+    class="list filter__list"
 >
     <?php foreach ($swatchData['options'] as $option => $label): ?>
         <?php if (isset($swatchData['swatches'][$option]['type'])): ?>
             <?php switch ($swatchData['swatches'][$option]['type']) {
                 case '3':
                 ?>
-                    <a
-                        href="<?= $label['link'] ?>"
-                        aria-label="<?= $label['label'] ?>"
-                    >
-                        <div
-                            tabindex="-1"
-                            option-type="3"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                        ></div>
-                    </a>
+                    <li>
+                        <a
+                            href="<?= $label['link'] ?>"
+                            aria-label="<?= $label['label'] ?>"
+                        >
+                            <div
+                                tabindex="-1"
+                                option-type="3"
+                                option-id="<?= $option ?>"
+                                option-label="<?= $label['label'] ?>"
+                            ></div>
+                        </a>
+                    </li>
                 <?php
                 break;
                 case '2':
@@ -28,61 +30,67 @@
                     $swatchData['swatches'][$option]['value']); ?>
                     <?php $swatchImagePath = $block->getSwatchPath('swatch_image',
                     $swatchData['swatches'][$option]['value']); ?>
-                    <a
-                        href="<?= $label['link'] ?>"
-                        aria-label="<?= $label['label'] ?>"
-                    >
-                        <div
-                            tabindex="-1"
-                            option-type="2"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                            option-tooltip-thumb="<?= $swatchThumbPath ?>"
-                            style="background: url(<?= $swatchImagePath ?>) no-repeat center; background-size: cover;"
-                        ></div>
-                    </a>
+                    <li>
+                        <a
+                            href="<?= $label['link'] ?>"
+                            aria-label="<?= $label['label'] ?>"
+                        >
+                            <div
+                                tabindex="-1"
+                                option-type="2"
+                                option-id="<?= $option ?>"
+                                option-label="<?= $label['label'] ?>"
+                                option-tooltip-thumb="<?= $swatchThumbPath ?>"
+                                style="background: url(<?= $swatchImagePath ?>) no-repeat center; background-size: cover;"
+                            ></div>
+                        </a>
+                    </li>
                 <?php
                 break;
                 case '1':
                 ?>
-                    <a
-                        href="<?= $label['link'] ?>"
-                        aria-label="<?= $label['label'] ?>"
-                        class="filter__color-option"
-                    >
-                        <div
-                            class="filter__color-sample"
-                            tabindex="-1"
-                            option-type="1"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                            option-tooltip-value="<?= $swatchData['swatches'][$option]['value'] ?>"
-                            style="background: <?= $swatchData['swatches'][$option]['value'] ?>"
-                        ></div>
-                        <span class="filter__color-label">
-                            <?= $label['label'] ?>
-                        </span>
-                    </a>
+                    <li>
+                        <a
+                            href="<?= $label['link'] ?>"
+                            aria-label="<?= $label['label'] ?>"
+                            class="filter__color-option"
+                        >
+                            <div
+                                class="filter__color-sample"
+                                tabindex="-1"
+                                option-type="1"
+                                option-id="<?= $option ?>"
+                                option-label="<?= $label['label'] ?>"
+                                option-tooltip-value="<?= $swatchData['swatches'][$option]['value'] ?>"
+                                style="background: <?= $swatchData['swatches'][$option]['value'] ?>"
+                            ></div>
+                            <span class="filter__color-label">
+                                <?= $label['label'] ?>
+                            </span>
+                        </a>
+                    </li>
                 <?php
                 break;
                 case '0':
                 default:
                 ?>
-                    <a
-                        href="<?= $label['link'] ?>"
-                        aria-label="<?= $label['label'] ?>"
-                        class="filter__swatch-option"
-                        option-type="0"
-                        option-id="<?= $option ?>"
-                        option-label="<?= $label['label'] ?>"
-                    >
-                        <?= $swatchData['swatches'][$option]['value'] ?>
-                    </a>
+                    <li class="filter__swatch-item">
+                        <a
+                            href="<?= $label['link'] ?>"
+                            aria-label="<?= $label['label'] ?>"
+                            class="filter__swatch-option"
+                            option-type="0"
+                            option-id="<?= $option ?>"
+                            option-label="<?= $label['label'] ?>"
+                        >
+                            <?= $swatchData['swatches'][$option]['value'] ?>
+                        </a>
+                    </li>
                 <?php break ?>
             <?php } ?>
         <?php endif ?>
     <?php endforeach ?>
-</div>
+</ul>
 
 <script>
     require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index 346e0c82b..977a7812c 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -22,26 +22,30 @@
         data-content="checkbox"
         aria-hidden="true"
     >
-        <?php foreach ($block->getItems() as $_item): ?>
-            <a
-                href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
-                class="
-                    checkbox
-                    checkbox--link
-                    <?= $block->isActive($_item['value_id']) ? 'checkbox--link-checked' : '' ?>
-                "
-                title="<?= $_item['label'] ?>"
-            >
-                <svg
-                    class="checkbox__icon"
-                >
-                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
-                </svg>
-                <span class="checkbox__label">
-                    <?= $_item['label'] ?>
-                </span>
-            </a>
-        <?php endforeach; ?>
+        <ul class="list">
+            <?php foreach ($block->getItems() as $_item): ?>
+                <li>
+                    <a
+                        href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
+                        class="
+                            checkbox
+                            checkbox--link
+                            <?= $block->isActive($_item['value_id']) ? 'checkbox--link-checked' : '' ?>
+                        "
+                        title="<?= $_item['label'] ?>"
+                    >
+                        <svg
+                            class="checkbox__icon"
+                        >
+                            <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
+                        </svg>
+                        <span class="checkbox__label">
+                            <?= $_item['label'] ?>
+                        </span>
+                    </a>
+                </li>
+            <?php endforeach; ?>
+        </ul>
         <div class="filter__divider"></div>
     </div>
 </li>
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index 2c41d3d06..0a62ee6c9 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -2,7 +2,8 @@
 /** @var \Snowdog\SolrNavigation\Block\Navigation\ListItem $block */
 ?>
 
-<li class="
+<li
+    class="
         dropdown-list__item
         dropdown-list__item--collapse
         filter
@@ -21,27 +22,29 @@
             data-content="color"
             aria-hidden="true"
         >
-            <div class="filter__color">
+            <ul class="list filter__list">
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <a
-                        href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
-                        class="
-                            filter__color-option
-                            <?= $block->isActive($_item['value_id']) ? 'filter__color-option--active' : '' ?>
-                        "
-                        aria-label="<?= $_item['label'] ?>"
-                        title="<?= $_item['label'] ?>"
-                    >
-                        <div
-                            class="filter__color-sample"
-                            style="background: <?= $_item['swatch_value'] ?>"
-                        ></div>
-                        <span class="filter__color-label">
-                            <?= $_item['label'] ?>
-                        </span>
-                    </a>
+                    <li>
+                        <a
+                            href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
+                            class="
+                                filter__color-option
+                                <?= $block->isActive($_item['value_id']) ? 'filter__color-option--active' : '' ?>
+                            "
+                            aria-label="<?= $_item['label'] ?>"
+                            title="<?= $_item['label'] ?>"
+                        >
+                            <div
+                                class="filter__color-sample"
+                                style="background: <?= $_item['swatch_value'] ?>"
+                            ></div>
+                            <span class="filter__color-label">
+                                <?= $_item['label'] ?>
+                            </span>
+                        </a>
+                    </li>
                 <?php endforeach ?>
-            </div>
+            </ul>
             <div class="filter__divider"></div>
         </div>
     <?php else : ?>
@@ -57,21 +60,23 @@
             data-content="swatch"
             aria-hidden="true"
         >
-            <div class="filter__swatch">
+            <ul class="list filter__list">
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <a
-                        href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
-                        class="
-                            filter__swatch-option
-                            <?= $block->isActive($_item['value_id']) ? 'filter__swatch-option--active' : '' ?>
-                        "
-                        aria-label="<?= $_item['label'] ?>"
-                        title="<?= $_item['label'] ?>"
-                    >
-                        <?= $_item['label'] ?>
-                    </a>
+                    <li class="filter__swatch-item">
+                        <a
+                            href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
+                            class="
+                                filter__swatch-option
+                                <?= $block->isActive($_item['value_id']) ? 'filter__swatch-option--active' : '' ?>
+                            "
+                            aria-label="<?= $_item['label'] ?>"
+                            title="<?= $_item['label'] ?>"
+                        >
+                            <?= $_item['label'] ?>
+                        </a>
+                    </li>
                 <?php endforeach ?>
-            </div>
+            </ul>
             <div class="filter__divider"></div>
         </div>
     <?php endif; ?>

From ca7738ea6102f982965a1ae00fb8f571317db7ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 21 Nov 2018 16:16:20 +0100
Subject: [PATCH 03/69] #46308 - Remove unused productSwatch template

---
 .../product/layered/productSwatch.phtml       | 111 ------------------
 1 file changed, 111 deletions(-)
 delete mode 100644 Magento_Swatches/templates/product/layered/productSwatch.phtml

diff --git a/Magento_Swatches/templates/product/layered/productSwatch.phtml b/Magento_Swatches/templates/product/layered/productSwatch.phtml
deleted file mode 100644
index 91f6600dc..000000000
--- a/Magento_Swatches/templates/product/layered/productSwatch.phtml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-// @codingStandardsIgnoreFile
-
-/** @var $block \Magento\Swatches\Block\LayeredNavigation\RenderLayered */
-?>
-<?php $swatchData = $block->getSwatchData(); ?>
-
-<div
-    class="<?= $swatchData['attribute_code'] ?>"
-    attribute-code="<?= $swatchData['attribute_code'] ?>"
-    attribute-id="<?= $swatchData['attribute_id'] ?>"
->
-    <div class="swatch clearfix">
-        <?php foreach ($swatchData['options'] as $option => $label): ?>
-            <a
-                href="<?= $label['link'] ?>"
-                aria-label="<?= $label['label'] ?>"
-                class="link"
-            >
-                <?php if (isset($swatchData['swatches'][$option]['type'])) { ?>
-                    <?php switch ($swatchData['swatches'][$option]['type']) {
-                        case '3':
-                    ?>
-                        <div
-                            class="swatch__option <?= $label['custom_style'] ?>"
-                            tabindex="-1"
-                            option-type="3"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                            option-tooltip-thumb=""
-                            option-tooltip-value=""
-                        ></div>
-                    <?php
-                        break;
-                        case '2':
-                    ?>
-                        <?php
-                            $swatchThumbPath = $block->getSwatchPath('swatch_thumb',
-                            $swatchData['swatches'][$option]['value']);
-                        ?>
-
-                        <?php
-                            $swatchImagePath = $block->getSwatchPath('swatch_image',
-                            $swatchData['swatches'][$option]['value']);
-                        ?>
-
-                        <div
-                            class="swatch__option swatch__option--attribute <?= $label['custom_style'] ?>"
-                            tabindex="-1"
-                            option-type="2"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                            option-tooltip-thumb="<?= $swatchThumbPath ?>"
-                            option-tooltip-value=""
-                            style="
-                                background-image: url(<?= $swatchImagePath ?>);
-                                background-repeat: no-repeat;
-                                background-position: center;
-                                background-size: initial;
-                            "
-                        ></div>
-                    <?php
-                        break;
-                        case '1':
-                    ?>
-                        <div
-                            class="swatch__option swatch__option--attribute <?= $label['custom_style'] ?>"
-                            tabindex="-1"
-                            option-type="1"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                            option-tooltip-thumb=""
-                            option-tooltip-value="<?= $swatchData['swatches'][$option]['value'] ?>"
-                            style="
-                                background-image: <?= $swatchData['swatches'][$option]['value'] ?>;
-                                background-repeat: no-repeat;
-                                background-position: center;
-                                background-size: initial;"
-                        ></div>
-                    <?php
-                        break;
-                        case '0':
-                        default:
-                    ?>
-                        <div
-                            class="swatch__option <?= $label['custom_style'] ?>"
-                            tabindex="-1"
-                            option-type="0"
-                            option-id="<?= $option ?>"
-                            option-label="<?= $label['label'] ?>"
-                            option-tooltip-thumb=""
-                            option-tooltip-value=""
-                        >
-                            <?= $swatchData['swatches'][$option]['value'] ?>
-                        </div>
-                    <?php
-                        break;
-                    } ?>
-                <?php } ?>
-            </a>
-        <?php endforeach; ?>
-    </div>
-</div>
-
-<script>
-    require(["jquery", "jquery/ui", "Magento_Swatches/js/swatch-renderer"], function ($) {
-        $('.swatch-layered.<?= $swatchData['attribute_code'] ?>')
-            .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
-            .SwatchRendererTooltip();
-    });
-</script>

From 591a927f0fab881155e163218229efd5d1505c78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 21 Nov 2018 16:21:34 +0100
Subject: [PATCH 04/69] #46308 - Add ul and li to checkbox filters in no-solr
 version

---
 .../templates/layer/filter.phtml              | 24 ++++++++++---------
 .../templates/layer/view.phtml                |  5 ++--
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/filter.phtml b/Magento_LayeredNavigation/templates/layer/filter.phtml
index 3f96c088b..6b0344dee 100644
--- a/Magento_LayeredNavigation/templates/layer/filter.phtml
+++ b/Magento_LayeredNavigation/templates/layer/filter.phtml
@@ -1,15 +1,17 @@
 <?php foreach ($filterItems as $filterItem): ?>
     <?php if ($filterItem->getCount() > 0): ?>
-        <a
-            href="<?= $block->escapeUrl($filterItem->getUrl()) ?>"
-            class="checkbox checkbox--link"
-        >
-            <svg class="checkbox__icon">
-                <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
-            </svg>
-            <span class="checkbox__label">
-                <?= $filterItem->getLabel() ?>
-            </span>
-        </a>
+        <li>
+            <a
+                href="<?= $block->escapeUrl($filterItem->getUrl()) ?>"
+                class="checkbox checkbox--link"
+            >
+                <svg class="checkbox__icon">
+                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
+                </svg>
+                <span class="checkbox__label">
+                    <?= $filterItem->getLabel() ?>
+                </span>
+            </a>
+        </li>
     <?php endif ?>
 <?php endforeach ?>
diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index 5cae11c1d..7c26395b6 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -61,7 +61,9 @@
                                 data-content="checkbox"
                                 aria-hidden="true"
                             >
-                                <?= $block->getChildBlock('renderer')->render($filter) ?>
+                                <ul class="list">
+                                    <?= $block->getChildBlock('renderer')->render($filter) ?>
+                                </ul>
                             </div>
                         </li>
                     <?php endif ?>
@@ -70,4 +72,3 @@
         </div>
     <?php endif ?>
 <?php endif ?>
-

From cf92efe66b7c3fd7f38857389403531f02c3c30e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 21 Nov 2018 23:30:54 +0100
Subject: [PATCH 05/69] #46308 - Add heading to filter's label

---
 Magento_LayeredNavigation/templates/layer/view.phtml      | 4 +++-
 .../templates/navigation/categories.phtml                 | 4 +++-
 Snowdog_SolrNavigation/templates/navigation/list.phtml    | 4 +++-
 Snowdog_SolrNavigation/templates/navigation/range.phtml   | 4 +++-
 .../templates/navigation/visual_swatch.phtml              | 8 ++++++--
 5 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index 7c26395b6..7d9abba0c 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -51,7 +51,9 @@
                                 class="dropdown-list__label filter__label"
                                 aria-controls="checkbox"
                             >
-                                <?= $block->escapeHtml(__($filter->getName())) ?>
+                                <h3 class="filter__label-title">
+                                    <?= $block->escapeHtml(__($filter->getName())) ?>
+                                </h3>
                                 <svg class="icon dropdown-list__icon">
                                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                                 </svg>
diff --git a/Snowdog_SolrNavigation/templates/navigation/categories.phtml b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
index cc5873994..7af0f7cf3 100644
--- a/Snowdog_SolrNavigation/templates/navigation/categories.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
@@ -14,7 +14,9 @@ $subCategories = $block->getSubCategories(2)
             class="dropdown-list__label filter__label"
             aria-controls="checkbox"
         >
-            <?= __('Category') ?>
+            <h3 class="filter__label-title">
+                <?= __('Category') ?>
+            </h3>
             <svg class="icon dropdown-list__icon">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index 977a7812c..f6293abe2 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -11,7 +11,9 @@
         class="dropdown-list__label filter__label"
         aria-controls="checkbox"
     >
-        <?= $block->getAttributeLabel() ?>
+        <h3 class="filter__label-title">
+            <?= $block->getAttributeLabel() ?>
+        </h3>
         <svg class="icon dropdown-list__icon">
             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
         </svg>
diff --git a/Snowdog_SolrNavigation/templates/navigation/range.phtml b/Snowdog_SolrNavigation/templates/navigation/range.phtml
index 4ce0fba1c..99ea54cd2 100644
--- a/Snowdog_SolrNavigation/templates/navigation/range.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/range.phtml
@@ -9,7 +9,9 @@ $_min = number_format($block->getMin(), 2);
 <?php if (!($_max === $_min)): ?>
     <li class="dropdown-list__item dropdown-list__item--collapse filter">
         <div class="dropdown-list__label filter__label" aria-controls="range">
-            <?= $block->getAttributeLabel() ?>
+            <h3 class="filter__label-title">
+                <?= $block->getAttributeLabel() ?>
+            </h3>
             <svg class="icon dropdown-list__icon">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index 0a62ee6c9..16aef615b 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -11,7 +11,9 @@
 >
     <?php if (strtolower($block->getAttributeLabel()) == 'color') : ?>
         <div class="dropdown-list__label filter__label" aria-controls="color">
-            <?= $block->getAttributeLabel() ?>
+            <h3 class="filter__label-title">
+                <?= $block->getAttributeLabel() ?>
+            </h3>
             <svg class="icon dropdown-list__icon">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
@@ -49,7 +51,9 @@
         </div>
     <?php else : ?>
         <div class="dropdown-list__label filter__label" aria-controls="swatch">
-            <?= $block->getAttributeLabel() ?>
+            <h3 class="filter__label-title">
+                <?= $block->getAttributeLabel() ?>
+            </h3>
             <svg class="icon dropdown-list__icon">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>

From 5ba8407615edd2e4e235ed121ddef0cb5a02119b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 21 Nov 2018 23:51:18 +0100
Subject: [PATCH 06/69] #46308 - Move sidebar before products for proper focus
 order

---
 Magento_Catalog/layout/catalog_category_view.xml            | 3 +++
 Magento_CatalogSearch/layout/catalogsearch_result_index.xml | 3 +++
 Snowdog_SolrNavigation/layout/snownav_catalog_view.xml      | 6 ++++--
 Snowdog_SolrNavigation/layout/snownav_search_view.xml       | 6 ++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Magento_Catalog/layout/catalog_category_view.xml b/Magento_Catalog/layout/catalog_category_view.xml
index 64318c9d4..0705ea5fa 100644
--- a/Magento_Catalog/layout/catalog_category_view.xml
+++ b/Magento_Catalog/layout/catalog_category_view.xml
@@ -14,5 +14,8 @@
         <referenceBlock name="sale.reorder.sidebar" remove="false"/>
         <referenceBlock name="wishlist_sidebar" remove="false"/>
         <referenceBlock name="catalog.compare.sidebar" remove="false"/>
+
+        <!-- Moved blocks -->
+        <move element="div.sidebar.main" destination="columns" before="main"/>
     </body>
 </page>
diff --git a/Magento_CatalogSearch/layout/catalogsearch_result_index.xml b/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
index 64318c9d4..0705ea5fa 100644
--- a/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
+++ b/Magento_CatalogSearch/layout/catalogsearch_result_index.xml
@@ -14,5 +14,8 @@
         <referenceBlock name="sale.reorder.sidebar" remove="false"/>
         <referenceBlock name="wishlist_sidebar" remove="false"/>
         <referenceBlock name="catalog.compare.sidebar" remove="false"/>
+
+        <!-- Moved blocks -->
+        <move element="div.sidebar.main" destination="columns" before="main"/>
     </body>
 </page>
diff --git a/Snowdog_SolrNavigation/layout/snownav_catalog_view.xml b/Snowdog_SolrNavigation/layout/snownav_catalog_view.xml
index 0b8222751..f48181497 100644
--- a/Snowdog_SolrNavigation/layout/snownav_catalog_view.xml
+++ b/Snowdog_SolrNavigation/layout/snownav_catalog_view.xml
@@ -28,8 +28,6 @@
             />
         </referenceContainer>
 
-        <move element="solr.breadcrumbs" destination="page.top" before="-"/>
-
         <referenceContainer name="columns" htmlClass="catalog-list"/>
         <referenceContainer name="div.sidebar.main" htmlClass="catalog-list__sidebar"/>
         <referenceContainer name="div.sidebar.additional" htmlClass="catalog-list__sidebar-additional"/>
@@ -41,5 +39,9 @@
 
         <!-- Removed blocks -->
         <referenceBlock name="solr.seo.category" remove="true"/>
+
+        <!-- Moved blocks -->
+        <move element="div.sidebar.main" destination="columns" before="main"/>
+        <move element="solr.breadcrumbs" destination="page.top" before="-"/>
     </body>
 </page>
diff --git a/Snowdog_SolrNavigation/layout/snownav_search_view.xml b/Snowdog_SolrNavigation/layout/snownav_search_view.xml
index 7b98031fe..986dbd4dc 100644
--- a/Snowdog_SolrNavigation/layout/snownav_search_view.xml
+++ b/Snowdog_SolrNavigation/layout/snownav_search_view.xml
@@ -28,8 +28,6 @@
             />
         </referenceContainer>
 
-        <move element="solr.breadcrumbs" destination="page.top" before="-"/>
-
         <referenceContainer name="columns" htmlClass="catalog-list"/>
         <referenceContainer name="div.sidebar.main" htmlClass="catalog-list__sidebar"/>
         <referenceContainer name="div.sidebar.additional" htmlClass="catalog-list__sidebar-additional"/>
@@ -38,5 +36,9 @@
         <referenceBlock name="sale.reorder.sidebar" remove="false"/>
         <referenceBlock name="wishlist_sidebar" remove="false"/>
         <referenceBlock name="catalog.compare.sidebar" remove="false"/>
+
+        <!-- Moved blocks -->
+        <move element="div.sidebar.main" destination="columns" before="main"/>
+        <move element="solr.breadcrumbs" destination="page.top" before="-"/>
     </body>
 </page>

From 3e355ad209d25d109b87489c9063a547f727875f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 22 Nov 2018 00:04:39 +0100
Subject: [PATCH 07/69] #46308 - Add role img and title to filter icons

---
 Magento_LayeredNavigation/templates/layer/state.phtml       | 3 ++-
 Magento_LayeredNavigation/templates/layer/view.phtml        | 3 ++-
 Snowdog_SolrNavigation/templates/filters/list.phtml         | 3 ++-
 Snowdog_SolrNavigation/templates/filters/range.phtml        | 3 ++-
 .../templates/filters/visual_swatch.phtml                   | 3 ++-
 .../templates/navigation/categories.phtml                   | 3 ++-
 Snowdog_SolrNavigation/templates/navigation/list.phtml      | 3 ++-
 Snowdog_SolrNavigation/templates/navigation/range.phtml     | 3 ++-
 .../templates/navigation/visual_swatch.phtml                | 6 ++++--
 9 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index 935e55fcf..d8e645500 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -17,7 +17,8 @@
                         aria-label="<?= __('Disable filter') ?>"
                         title="<?= __('Disable filter') ?>"
                     >
-                        <svg class="icon active-filters__remove-icon">
+                        <svg class="icon active-filters__remove-icon" role="img">
+                            <title><?= __('Close') ?></title>
                             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#close') ?>"></use>
                         </svg>
                     </a>
diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index 7d9abba0c..399cfd9bb 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -54,7 +54,8 @@
                                 <h3 class="filter__label-title">
                                     <?= $block->escapeHtml(__($filter->getName())) ?>
                                 </h3>
-                                <svg class="icon dropdown-list__icon">
+                                <svg class="icon dropdown-list__icon" role="img">
+                                    <title><?= __('Arrow down') ?></title>
                                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                                 </svg>
                             </div>
diff --git a/Snowdog_SolrNavigation/templates/filters/list.phtml b/Snowdog_SolrNavigation/templates/filters/list.phtml
index 090948ac4..db40fa923 100644
--- a/Snowdog_SolrNavigation/templates/filters/list.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/list.phtml
@@ -7,7 +7,8 @@
             aria-label="<?= __('Disable filter') ?>"
             title="<?= __('Disable filter') ?>"
         >
-            <svg class="icon active-filters__remove-icon">
+            <svg class="icon active-filters__remove-icon" role="img">
+                <title><?= __('Close') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#close') ?>"></use>
             </svg>
         </a>
diff --git a/Snowdog_SolrNavigation/templates/filters/range.phtml b/Snowdog_SolrNavigation/templates/filters/range.phtml
index 101d2d556..0321fc1d1 100644
--- a/Snowdog_SolrNavigation/templates/filters/range.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/range.phtml
@@ -9,7 +9,8 @@ $_currencyHelper = $this->helper('Magento\Framework\Pricing\Helper\Data');
         aria-label="<?= __('Disable filter') ?>"
         title="<?= __('Disable filter') ?>"
     >
-        <svg class="icon active-filters__remove-icon">
+        <svg class="icon active-filters__remove-icon" role="img">
+            <title><?= __('Close') ?></title>
             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#close') ?>"></use>
         </svg>
     </a>
diff --git a/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
index 3df5770a8..867bb9638 100644
--- a/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
@@ -7,7 +7,8 @@
             aria-label="<?= __('Disable filter') ?>"
             title="<?= __('Disable filter') ?>"
         >
-            <svg class="icon active-filters__remove-icon">
+            <svg class="icon active-filters__remove-icon" role="img">
+                <title><?= __('Close') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#close') ?>"></use>
             </svg>
         </a>
diff --git a/Snowdog_SolrNavigation/templates/navigation/categories.phtml b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
index 7af0f7cf3..e7f173e3a 100644
--- a/Snowdog_SolrNavigation/templates/navigation/categories.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
@@ -17,7 +17,8 @@ $subCategories = $block->getSubCategories(2)
             <h3 class="filter__label-title">
                 <?= __('Category') ?>
             </h3>
-            <svg class="icon dropdown-list__icon">
+            <svg class="icon dropdown-list__icon" role="img">
+                <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </div>
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index f6293abe2..0be8b4ed8 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -14,7 +14,8 @@
         <h3 class="filter__label-title">
             <?= $block->getAttributeLabel() ?>
         </h3>
-        <svg class="icon dropdown-list__icon">
+        <svg class="icon dropdown-list__icon" role="img">
+            <title><?= __('Arrow down') ?></title>
             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
         </svg>
     </div>
diff --git a/Snowdog_SolrNavigation/templates/navigation/range.phtml b/Snowdog_SolrNavigation/templates/navigation/range.phtml
index 99ea54cd2..e1fd121c7 100644
--- a/Snowdog_SolrNavigation/templates/navigation/range.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/range.phtml
@@ -12,7 +12,8 @@ $_min = number_format($block->getMin(), 2);
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
-            <svg class="icon dropdown-list__icon">
+            <svg class="icon dropdown-list__icon" role="img">
+                <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </div>
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index 16aef615b..f09452810 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -14,7 +14,8 @@
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
-            <svg class="icon dropdown-list__icon">
+            <svg class="icon dropdown-list__icon" role="img">
+                <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </div>
@@ -54,7 +55,8 @@
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
-            <svg class="icon dropdown-list__icon">
+            <svg class="icon dropdown-list__icon" role="img">
+                <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </div>

From 238a40694b43e354f50d9143029d10d736456b05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 7 Dec 2018 12:59:53 +0100
Subject: [PATCH 08/69] #46308 - Remove dropdown transition, hide content
 instead of changing height

---
 Magento_Theme/web/js/dropdown-list.babel.js | 25 ---------------------
 1 file changed, 25 deletions(-)

diff --git a/Magento_Theme/web/js/dropdown-list.babel.js b/Magento_Theme/web/js/dropdown-list.babel.js
index 041ab6ac2..9b1db510d 100755
--- a/Magento_Theme/web/js/dropdown-list.babel.js
+++ b/Magento_Theme/web/js/dropdown-list.babel.js
@@ -36,22 +36,14 @@ class DropdownList {
           dropdownContent = dropdownItem.querySelector(`.${this.contentClass}`);
 
     if (window.matchMedia(this.mq).matches) {
-      dropdownContent.style.height = 'auto';
       this.removeAriaAttributes(item, dropdownContent);
     }
     else {
-      dropdownContent.style.height = 0;
       this.setAriaAttributes(item, dropdownContent, true);
       item.disabled = false;
     }
   }
 
-  getContentHeight(item) {
-    return [...item.children]
-      .map(elem => elem.clientHeight)
-      .reduce((a, b) => a + b, 0) + 'px';
-  }
-
   closeInnerdDropdowns(item) {
     const subDropDowns = [...item.querySelectorAll(`${this.dropdownCollapseLabel}[aria-expanded="true"]`)];
     subDropDowns.forEach(key => {
@@ -59,7 +51,6 @@ class DropdownList {
             dropdownItem    = key.parentNode,
             dropdownContent = dropdownItem.querySelector(`.${this.contentClass}[data-content="${dropdownId}"]`);
       this.setAriaAttributes(key, dropdownContent, true);
-      dropdownContent.style.height = 0;
     });
   }
 
@@ -71,25 +62,9 @@ class DropdownList {
 
     if (!this.isMediumOpen(dropdownBlock)) {
       if (dropdownContent.clientHeight > 0) {
-        const sectionHeight     = this.getContentHeight(dropdownContent),
-              elementTransition = dropdownContent.style.transition;
-        dropdownContent.style.transition = '';
         this.setAriaAttributes(item, dropdownContent, true);
-        requestAnimationFrame(() => {
-          dropdownContent.style.height = sectionHeight;
-          dropdownContent.style.transition = elementTransition;
-          requestAnimationFrame(() => {
-            dropdownContent.style.height = 0;
-            this.closeInnerdDropdowns(dropdownContent);
-          });
-        });
       }
       else {
-        const openedDropdowns = [...document.querySelectorAll('.dropdown-list__content[aria-hidden="false"]')];
-        dropdownContent.style.height = this.getContentHeight(dropdownContent);
-        openedDropdowns.map(openedDropdown => {
-          openedDropdown.style.height = 'auto';
-        });
         this.setAriaAttributes(item, dropdownContent, false);
       }
     }

From 827fad91485d4d2b72554c99ed5adcde7203fb53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 7 Dec 2018 14:38:28 +0100
Subject: [PATCH 09/69] #46308 - Update filter trigger attributes

---
 .../templates/layer/view.phtml                | 11 +++++---
 .../templates/navigation/categories.phtml     | 12 +++++----
 .../templates/navigation/list.phtml           | 12 +++++----
 .../templates/navigation/range.phtml          | 13 +++++++---
 .../templates/navigation/visual_swatch.phtml  | 26 +++++++++++++------
 5 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index 399cfd9bb..a0de46b86 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -47,9 +47,11 @@
                                 filter
                             "
                         >
-                            <div
+                            <button
+                                type="button"
                                 class="dropdown-list__label filter__label"
-                                aria-controls="checkbox"
+                                aria-controls="filter-checkbox"
+                                aria-expanded="false"
                             >
                                 <h3 class="filter__label-title">
                                     <?= $block->escapeHtml(__($filter->getName())) ?>
@@ -58,10 +60,11 @@
                                     <title><?= __('Arrow down') ?></title>
                                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                                 </svg>
-                            </div>
+                            </button>
                             <div
+                                id="filter-checkbox"
                                 class="dropdown-list__content filter__content"
-                                data-content="checkbox"
+                                data-content="filter-checkbox"
                                 aria-hidden="true"
                             >
                                 <ul class="list">
diff --git a/Snowdog_SolrNavigation/templates/navigation/categories.phtml b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
index e7f173e3a..0f06896e0 100644
--- a/Snowdog_SolrNavigation/templates/navigation/categories.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
@@ -10,9 +10,11 @@ $subCategories = $block->getSubCategories(2)
             filter
         "
     >
-        <div
+        <button
+            type="button"
             class="dropdown-list__label filter__label"
-            aria-controls="checkbox"
+            aria-controls="filter-categories"
+            aria-expanded="false"
         >
             <h3 class="filter__label-title">
                 <?= __('Category') ?>
@@ -21,11 +23,11 @@ $subCategories = $block->getSubCategories(2)
                 <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
-        </div>
+        </button>
         <div
-            id="checkbox"
+            id="filter-categories"
             class="dropdown-list__content filter__content"
-            data-content="checkbox"
+            data-content="filter-categories"
             aria-hidden="true"
         >
             <ul class="list filter__category-list">
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index 0be8b4ed8..9906b9cb2 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -7,9 +7,11 @@
         filter
     "
 >
-    <div
+    <button
+        type="button"
         class="dropdown-list__label filter__label"
-        aria-controls="checkbox"
+        aria-controls="filter-checkbox"
+        aria-expanded="false"
     >
         <h3 class="filter__label-title">
             <?= $block->getAttributeLabel() ?>
@@ -18,11 +20,11 @@
             <title><?= __('Arrow down') ?></title>
             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
         </svg>
-    </div>
+    </button>
     <div
-        id="checkbox"
+        id="filter-checkbox"
         class="dropdown-list__content filter__content"
-        data-content="checkbox"
+        data-content="filter-checkbox"
         aria-hidden="true"
     >
         <ul class="list">
diff --git a/Snowdog_SolrNavigation/templates/navigation/range.phtml b/Snowdog_SolrNavigation/templates/navigation/range.phtml
index e1fd121c7..8f26588ac 100644
--- a/Snowdog_SolrNavigation/templates/navigation/range.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/range.phtml
@@ -8,7 +8,12 @@ $_min = number_format($block->getMin(), 2);
 
 <?php if (!($_max === $_min)): ?>
     <li class="dropdown-list__item dropdown-list__item--collapse filter">
-        <div class="dropdown-list__label filter__label" aria-controls="range">
+        <button
+            type="button"
+            class="dropdown-list__label filter__label"
+            aria-controls="filter-range"
+            aria-expanded="false"
+        >
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
@@ -16,11 +21,11 @@ $_min = number_format($block->getMin(), 2);
                 <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
-        </div>
+        </button>
         <div
-            id="range"
+            id="filter-range"
             class="dropdown-list__content filter__content"
-            data-content="range"
+            data-content="filter-range"
             aria-hidden="true"
             data-mage-init='{ "range": { } }'
         >
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index f09452810..58d80de1a 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -10,7 +10,12 @@
     "
 >
     <?php if (strtolower($block->getAttributeLabel()) == 'color') : ?>
-        <div class="dropdown-list__label filter__label" aria-controls="color">
+        <button
+            type="button"
+            class="dropdown-list__label filter__label"
+            aria-controls="filter-color"
+            aria-expanded="false"
+        >
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
@@ -18,11 +23,11 @@
                 <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
-        </div>
+        </button>
         <div
-            id="color"
+            id="filter-color"
             class="dropdown-list__content filter__content"
-            data-content="color"
+            data-content="filter-color"
             aria-hidden="true"
         >
             <ul class="list filter__list">
@@ -51,7 +56,12 @@
             <div class="filter__divider"></div>
         </div>
     <?php else : ?>
-        <div class="dropdown-list__label filter__label" aria-controls="swatch">
+        <button
+            type="button"
+            class="dropdown-list__label filter__label"
+            aria-controls="filter-swatch"
+            aria-expanded="false"
+        >
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
@@ -59,11 +69,11 @@
                 <title><?= __('Arrow down') ?></title>
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
-        </div>
+        </button>
         <div
-            id="swatch"
+            id="filter-swatch"
             class="dropdown-list__content filter__content"
-            data-content="swatch"
+            data-content="filter-swatch"
             aria-hidden="true"
         >
             <ul class="list filter__list">

From 7b1e01bdf76dca23bd1528c4ba3a1eccc3f68c34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 7 Dec 2018 15:31:23 +0100
Subject: [PATCH 10/69] #46308 - Add class to filer color item

---
 Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index 58d80de1a..35e2ef774 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -32,7 +32,7 @@
         >
             <ul class="list filter__list">
                 <?php foreach ($block->getItems() as $_item): ?>
-                    <li>
+                    <li class="filter__color-item">
                         <a
                             href="<?= $block->getNavigationUrl($block->getAttributeCode(), $_item['value_id']) ?>"
                             class="

From b1707a129c06ae8673c844c15d2bfdbfc693d047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 7 Dec 2018 15:58:41 +0100
Subject: [PATCH 11/69] #46308 - Add more descriptive aria-label to remove
 filter button

---
 Magento_LayeredNavigation/templates/layer/state.phtml        | 4 ++--
 Snowdog_SolrNavigation/templates/filters/list.phtml          | 4 ++--
 Snowdog_SolrNavigation/templates/filters/range.phtml         | 4 ++--
 Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index d8e645500..e7035cb84 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -14,8 +14,8 @@
                     <a
                         href="<?= $_filter->getRemoveUrl() ?>"
                         class="active-filters__remove"
-                        aria-label="<?= __('Disable filter') ?>"
-                        title="<?= __('Disable filter') ?>"
+                        aria-label="<?= __('Disable filter') . ': ' . $block->stripTags($_filter->getLabel()) ?>"
+                        title="<?= __('Disable filter') . ': ' . $block->stripTags($_filter->getLabel()) ?>"
                     >
                         <svg class="icon active-filters__remove-icon" role="img">
                             <title><?= __('Close') ?></title>
diff --git a/Snowdog_SolrNavigation/templates/filters/list.phtml b/Snowdog_SolrNavigation/templates/filters/list.phtml
index db40fa923..542b62c17 100644
--- a/Snowdog_SolrNavigation/templates/filters/list.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/list.phtml
@@ -4,8 +4,8 @@
         <a
             href="<?= $block->getCleanUrl($valueId) ?>"
             class="active-filters__remove"
-            aria-label="<?= __('Disable filter') ?>"
-            title="<?= __('Disable filter') ?>"
+            aria-label="<?= __('Disable filter') . ': ' . $valueLabel ?>"
+            title="<?= __('Disable filter') . ': ' . $valueLabel ?>"
         >
             <svg class="icon active-filters__remove-icon" role="img">
                 <title><?= __('Close') ?></title>
diff --git a/Snowdog_SolrNavigation/templates/filters/range.phtml b/Snowdog_SolrNavigation/templates/filters/range.phtml
index 0321fc1d1..abd35a370 100644
--- a/Snowdog_SolrNavigation/templates/filters/range.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/range.phtml
@@ -6,8 +6,8 @@ $_currencyHelper = $this->helper('Magento\Framework\Pricing\Helper\Data');
     <a
         href="<?= $block->getCleanUrl() ?>"
         class="active-filters__remove"
-        aria-label="<?= __('Disable filter') ?>"
-        title="<?= __('Disable filter') ?>"
+        aria-label="<?= __('Disable filter') . ': ' . $block->getLabel() ?>"
+        title="<?= __('Disable filter') . ': ' . $block->getLabel() ?>"
     >
         <svg class="icon active-filters__remove-icon" role="img">
             <title><?= __('Close') ?></title>
diff --git a/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
index 867bb9638..01a78516b 100644
--- a/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
@@ -4,8 +4,8 @@
         <a
             href="<?= $block->getCleanUrl($valueId) ?>"
             class="active-filters__remove"
-            aria-label="<?= __('Disable filter') ?>"
-            title="<?= __('Disable filter') ?>"
+            aria-label="<?= __('Disable filter') . ': ' . $valueData['label'] ?>"
+            title="<?= __('Disable filter') . ': ' . $valueData['label'] ?>"
         >
             <svg class="icon active-filters__remove-icon" role="img">
                 <title><?= __('Close') ?></title>

From 2732cb892dadc52f50251e9b0136fe316a1d42fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 20 Dec 2018 15:39:42 +0100
Subject: [PATCH 12/69] #46308 - Update dropdown script to component's version,
 remove data-content attr

---
 .../templates/product/view/details.phtml      |  5 +-
 .../web/template/minicart/item/default.html   |  1 -
 .../templates/layer/view.phtml                |  1 -
 .../templates/footer/footer-links.phtml       | 60 ++++++++++---------
 Magento_Theme/web/js/dropdown-list.babel.js   | 45 +++++++-------
 .../templates/main-mobile/menu/sub_menu.phtml |  1 -
 .../templates/navigation/categories.phtml     |  1 -
 .../templates/navigation/list.phtml           |  1 -
 .../templates/navigation/range.phtml          |  1 -
 .../templates/navigation/visual_swatch.phtml  |  2 -
 10 files changed, 54 insertions(+), 64 deletions(-)

diff --git a/Magento_Catalog/templates/product/view/details.phtml b/Magento_Catalog/templates/product/view/details.phtml
index 9e19ef2d9..e7b54fe15 100644
--- a/Magento_Catalog/templates/product/view/details.phtml
+++ b/Magento_Catalog/templates/product/view/details.phtml
@@ -27,10 +27,7 @@
                 </svg>
             </div>
 
-            <div
-                class="tab__content <?= ($tabId == 1) ? 'tab__content--active' : ''; ?>"
-                data-content="tab-<?= $tabId; ?>"
-            >
+            <div class="tab__content <?= ($tabId == 1) ? 'tab__content--active' : ''; ?>">
                 <?= $html; ?>
             </div>
             <?php $tabId++; ?>
diff --git a/Magento_Checkout/web/template/minicart/item/default.html b/Magento_Checkout/web/template/minicart/item/default.html
index d251ac4c1..fb1994421 100644
--- a/Magento_Checkout/web/template/minicart/item/default.html
+++ b/Magento_Checkout/web/template/minicart/item/default.html
@@ -48,7 +48,6 @@ <h3 class="minicart-product__name">
                                 dropdown-list__content
                                 minicart-product__attributes-button
                             "
-                            data-content="see-details"
                             aria-hidden="true"
                         >
                             <dl
diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index a0de46b86..c1f67614d 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -64,7 +64,6 @@
                             <div
                                 id="filter-checkbox"
                                 class="dropdown-list__content filter__content"
-                                data-content="filter-checkbox"
                                 aria-hidden="true"
                             >
                                 <ul class="list">
diff --git a/Magento_Theme/templates/footer/footer-links.phtml b/Magento_Theme/templates/footer/footer-links.phtml
index 2aa32331e..878938492 100644
--- a/Magento_Theme/templates/footer/footer-links.phtml
+++ b/Magento_Theme/templates/footer/footer-links.phtml
@@ -1,12 +1,13 @@
 <!-- This should be moved to CMS Menu when customising features will be available. This file is temporary -->
-<div class="
+<div
+    class="
         dropdown-list
         dropdown-list@screen-m
         dropdown-list--is-open@screen-m
         dropdown-list--dark
         js-is-medium-open
-     "
-     data-mage-init='{ "dropdownList": {} }'
+    "
+    data-mage-init='{ "dropdownList": {} }'
 >
     <ul class="dropdown-list__list">
         <li class="
@@ -24,7 +25,7 @@
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
-            <div id="dropdown-help" class="dropdown-list__content" data-content="dropdown-help" aria-hidden="true">
+            <div id="dropdown-help" class="dropdown-list__content" aria-hidden="true">
                 <ul class="list footer__links-list">
                     <li class="list__item">
                         <a href="#" class="link footer__link">
@@ -59,20 +60,21 @@
                 dropdown-list__item--collapse
             "
         >
-            <button class="dropdown-list__label"
-                    type="button"
-                    aria-expanded="false"
-                    aria-controls="dropdown-info"
+            <button
+                class="dropdown-list__label"
+                type="button"
+                aria-expanded="false"
+                aria-controls="dropdown-info"
             >
                 <?= __('Information') ?>
                 <svg class="dropdown-list__icon">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
-            <div id="dropdown-info"
-                 class="dropdown-list__content"
-                 data-content="dropdown-info"
-                 aria-hidden="true"
+            <div
+                id="dropdown-info"
+                class="dropdown-list__content"
+                aria-hidden="true"
             >
                 <ul class="list footer__links-list">
                     <li class="list__item">
@@ -103,20 +105,21 @@
                 dropdown-list__item--collapse
             "
         >
-            <button class="dropdown-list__label"
-                    type="button"
-                    aria-expanded="false"
-                    aria-controls="dropdown-worth"
+            <button
+                class="dropdown-list__label"
+                type="button"
+                aria-expanded="false"
+                aria-controls="dropdown-worth"
             >
                 <?= __('Why is worth it') ?>
                 <svg class="dropdown-list__icon">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
-            <div id="dropdown-worth"
-                 class="dropdown-list__content"
-                 data-content="dropdown-worth"
-                 aria-hidden="true"
+            <div
+                id="dropdown-worth"
+                class="dropdown-list__content"
+                aria-hidden="true"
             >
                 <ul class="list footer__links-list">
                     <li class="list__item">
@@ -147,20 +150,21 @@
                 dropdown-list__item--collapse
             "
         >
-            <button class="dropdown-list__label"
-                    type="button"
-                    aria-expanded="false"
-                    aria-controls="dropdown-alpaca"
+            <button
+                class="dropdown-list__label"
+                type="button"
+                aria-expanded="false"
+                aria-controls="dropdown-alpaca"
             >
                 <?= __('Alpaca.pl') ?>
                 <svg class="dropdown-list__icon">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
-            <div id="dropdown-alpaca"
-                 class="dropdown-list__content"
-                 data-content="dropdown-alpaca"
-                 aria-hidden="true"
+            <div
+                id="dropdown-alpaca"
+                class="dropdown-list__content"
+                aria-hidden="true"
             >
                 <ul class="list footer__links-list">
                     <li class="list__item">
diff --git a/Magento_Theme/web/js/dropdown-list.babel.js b/Magento_Theme/web/js/dropdown-list.babel.js
index 9b1db510d..918c15587 100755
--- a/Magento_Theme/web/js/dropdown-list.babel.js
+++ b/Magento_Theme/web/js/dropdown-list.babel.js
@@ -44,28 +44,15 @@ class DropdownList {
     }
   }
 
-  closeInnerdDropdowns(item) {
-    const subDropDowns = [...item.querySelectorAll(`${this.dropdownCollapseLabel}[aria-expanded="true"]`)];
-    subDropDowns.forEach(key => {
-      const dropdownId      = key.getAttribute('aria-controls'),
-            dropdownItem    = key.parentNode,
-            dropdownContent = dropdownItem.querySelector(`.${this.contentClass}[data-content="${dropdownId}"]`);
-      this.setAriaAttributes(key, dropdownContent, true);
-    });
-  }
-
-  toggleContent(item) {
-    const dropdownId      = item.getAttribute('aria-controls'),
-          dropdownItem    = item.parentNode,
-          dropdownContent = dropdownItem.querySelector(`.${this.contentClass}[data-content="${dropdownId}"]`),
-          dropdownBlock   = item.closest('.dropdown-list');
+  toggleContent(trigger, dropdownContent, closing) {
+    const dropdownBlock = trigger.closest('.dropdown-list');
 
     if (!this.isMediumOpen(dropdownBlock)) {
       if (dropdownContent.clientHeight > 0) {
-        this.setAriaAttributes(item, dropdownContent, true);
-      }
-      else {
-        this.setAriaAttributes(item, dropdownContent, false);
+        this.setAriaAttributes(trigger, dropdownContent, true);
+        trigger.focus();
+      } else if (!closing) {
+        this.setAriaAttributes(trigger, dropdownContent, false);
       }
     }
   }
@@ -78,12 +65,22 @@ class DropdownList {
   }
 
   init() {
-    this.dropdownItem.forEach(
-      key => key.addEventListener('click', (e) => {
+    this.dropdownItem.forEach(key => {
+      const dropdownId = key.getAttribute('aria-controls'),
+        dropdownContent = document.getElementById(dropdownId);
+
+      key.addEventListener('click', e => {
         e.preventDefault();
-        this.toggleContent(key);
-      }, false)
-    );
+        this.toggleContent(key, dropdownContent);
+      }, false);
+
+      [key, dropdownContent].forEach(el => el.addEventListener('keydown', e => {
+        if (e.key === "Escape") {
+          this.toggleContent(key, dropdownContent, true);
+        }
+      }));
+    });
+
     this.setMediumOpen();
 
     window.addEventListener('resize', () => {
diff --git a/Snowdog_Menu/templates/main-mobile/menu/sub_menu.phtml b/Snowdog_Menu/templates/main-mobile/menu/sub_menu.phtml
index 3fc9585a9..cda0d1a75 100644
--- a/Snowdog_Menu/templates/main-mobile/menu/sub_menu.phtml
+++ b/Snowdog_Menu/templates/main-mobile/menu/sub_menu.phtml
@@ -9,7 +9,6 @@
             'class' => [
                 $menuClass . '__content'
             ],
-            'data-content' => 'dropdown-' . $parentNode->getNodeId(),
             'id' => 'dropdown-' . $parentNode->getNodeId(),
             'aria-hidden' => 'true'
         ];
diff --git a/Snowdog_SolrNavigation/templates/navigation/categories.phtml b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
index 0f06896e0..7509f01a3 100644
--- a/Snowdog_SolrNavigation/templates/navigation/categories.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
@@ -27,7 +27,6 @@ $subCategories = $block->getSubCategories(2)
         <div
             id="filter-categories"
             class="dropdown-list__content filter__content"
-            data-content="filter-categories"
             aria-hidden="true"
         >
             <ul class="list filter__category-list">
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index 9906b9cb2..59bc3ea05 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -24,7 +24,6 @@
     <div
         id="filter-checkbox"
         class="dropdown-list__content filter__content"
-        data-content="filter-checkbox"
         aria-hidden="true"
     >
         <ul class="list">
diff --git a/Snowdog_SolrNavigation/templates/navigation/range.phtml b/Snowdog_SolrNavigation/templates/navigation/range.phtml
index 8f26588ac..3e0af97c4 100644
--- a/Snowdog_SolrNavigation/templates/navigation/range.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/range.phtml
@@ -25,7 +25,6 @@ $_min = number_format($block->getMin(), 2);
         <div
             id="filter-range"
             class="dropdown-list__content filter__content"
-            data-content="filter-range"
             aria-hidden="true"
             data-mage-init='{ "range": { } }'
         >
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index 35e2ef774..a91dcaee4 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -27,7 +27,6 @@
         <div
             id="filter-color"
             class="dropdown-list__content filter__content"
-            data-content="filter-color"
             aria-hidden="true"
         >
             <ul class="list filter__list">
@@ -73,7 +72,6 @@
         <div
             id="filter-swatch"
             class="dropdown-list__content filter__content"
-            data-content="filter-swatch"
             aria-hidden="true"
         >
             <ul class="list filter__list">

From dba5e337b1795fd792f24567eb7938bfc2909d30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 20 Dec 2018 17:04:33 +0100
Subject: [PATCH 13/69] #46308 - Add skip to products button with script

---
 .../templates/layer/state.phtml               |  6 +++++
 Magento_Theme/requirejs-config.js             |  1 +
 Magento_Theme/web/js/skip-filters.babel.js    | 23 +++++++++++++++++++
 .../templates/filters.phtml                   |  8 ++++++-
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 Magento_Theme/web/js/skip-filters.babel.js

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index e7035cb84..9d4fa9e46 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -1,4 +1,10 @@
 <?php $_filters = $block->getActiveFilters() ?>
+<button
+    class="button button button--secondary filters__skip-button"
+    type="button"
+>
+    <?= __('Skip to products') ?>
+</button>
 <?php if (!empty($_filters)): ?>
     <h1 class="filters__heading">
         <?= __('Now Shopping by') ?>
diff --git a/Magento_Theme/requirejs-config.js b/Magento_Theme/requirejs-config.js
index 4ac8ee739..f0b0325c6 100644
--- a/Magento_Theme/requirejs-config.js
+++ b/Magento_Theme/requirejs-config.js
@@ -14,6 +14,7 @@ var config = {
       "filters"            : "Magento_Theme/js/filters.babel",
       "linksWrapper"       : "Magento_Theme/js/wrapper-collapsible",
       "select"             : "Magento_Theme/js/select.babel",
+      "skipFilters"        : "Magento_Theme/js/skip-filters.babel",
       "slider"             : "Magento_Theme/js/slider.babel",
       "popup"              : "Magento_Theme/js/popup.babel",
       "tab"                : "Magento_Theme/js/tab.babel"
diff --git a/Magento_Theme/web/js/skip-filters.babel.js b/Magento_Theme/web/js/skip-filters.babel.js
new file mode 100644
index 000000000..ab2f363b4
--- /dev/null
+++ b/Magento_Theme/web/js/skip-filters.babel.js
@@ -0,0 +1,23 @@
+'use strict';
+
+class SkipFilters {
+  constructor(element) {
+    this.trigger = element;
+    this.init();
+  }
+
+  init() {
+    this.trigger.addEventListener('click', () => {
+      this.skipToProducts();
+    });
+  }
+
+  skipToProducts() {
+    const gridBtn = document.querySelector('.toolbar__mode-button');
+    gridBtn.focus();
+  }
+}
+
+define(() => (config, element) => {
+  new SkipFilters(element);
+});
diff --git a/Snowdog_SolrNavigation/templates/filters.phtml b/Snowdog_SolrNavigation/templates/filters.phtml
index 566f0bc03..df5e1fa81 100644
--- a/Snowdog_SolrNavigation/templates/filters.phtml
+++ b/Snowdog_SolrNavigation/templates/filters.phtml
@@ -2,7 +2,13 @@
 /** @var \Snowdog\SolrNavigation\Block\Filters $block */
 $filters = $block->getFilterBlocks();
 ?>
-
+<button
+    class="button button button--secondary filters__skip-button"
+    type="button"
+    data-mage-init='{"skipFilters": {}}'
+>
+    <?= __('Skip to products') ?>
+</button>
 <?php if (!empty($filters)): ?>
     <h1 class="filters__heading">
         <?= __('Now Shopping by') ?>

From 6a9c6c3edca26a090f3fe60e52e61a4e5073d79f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 20 Dec 2018 17:57:40 +0100
Subject: [PATCH 14/69] #46308 - Update filter id, add missing attributes

---
 Magento_LayeredNavigation/templates/layer/state.phtml     | 1 +
 Magento_LayeredNavigation/templates/layer/view.phtml      | 4 ++--
 Magento_Swatches/templates/product/layered/renderer.phtml | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index 9d4fa9e46..e9c829019 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -2,6 +2,7 @@
 <button
     class="button button button--secondary filters__skip-button"
     type="button"
+    data-mage-init='{"skipFilters": {}}'
 >
     <?= __('Skip to products') ?>
 </button>
diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index c1f67614d..670fa3011 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -50,7 +50,7 @@
                             <button
                                 type="button"
                                 class="dropdown-list__label filter__label"
-                                aria-controls="filter-checkbox"
+                                aria-controls="filter-<?= __($filter->getName()) ?>"
                                 aria-expanded="false"
                             >
                                 <h3 class="filter__label-title">
@@ -62,7 +62,7 @@
                                 </svg>
                             </button>
                             <div
-                                id="filter-checkbox"
+                                id="filter-<?= __($filter->getName()) ?>"
                                 class="dropdown-list__content filter__content"
                                 aria-hidden="true"
                             >
diff --git a/Magento_Swatches/templates/product/layered/renderer.phtml b/Magento_Swatches/templates/product/layered/renderer.phtml
index bf71eeedc..6b32efb50 100644
--- a/Magento_Swatches/templates/product/layered/renderer.phtml
+++ b/Magento_Swatches/templates/product/layered/renderer.phtml
@@ -49,7 +49,7 @@
                 break;
                 case '1':
                 ?>
-                    <li>
+                    <li class="filter__color-item">
                         <a
                             href="<?= $label['link'] ?>"
                             aria-label="<?= $label['label'] ?>"

From af76566fe3c44d024fd5a935acc61d39f94532ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 20 Dec 2018 21:57:12 +0100
Subject: [PATCH 15/69] #46308 - Update changelog

---
 CHANGELOG.md                                           | 2 ++
 Magento_LayeredNavigation/templates/layer/filter.phtml | 3 ++-
 Magento_LayeredNavigation/templates/layer/state.phtml  | 2 +-
 Snowdog_SolrNavigation/templates/navigation/list.phtml | 5 ++---
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b74f0ff4b..f301897c7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - Missing homepagge container class for top notifications
 - Templates for product's page breadcrumbs
 - Confirmation link page styles
+- Support for escape key in dropdown script
 
 ### Fixed
 - Missing class for product attributes
@@ -16,6 +17,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Refactor dropdown list and nested list
 - Refactor menu and submenu templates
+- Refactor filters and accessibility improvements
 
 ## [1.0.0] - 2018-10-15
 ### Changed
diff --git a/Magento_LayeredNavigation/templates/layer/filter.phtml b/Magento_LayeredNavigation/templates/layer/filter.phtml
index 6b0344dee..0cafed447 100644
--- a/Magento_LayeredNavigation/templates/layer/filter.phtml
+++ b/Magento_LayeredNavigation/templates/layer/filter.phtml
@@ -5,7 +5,8 @@
                 href="<?= $block->escapeUrl($filterItem->getUrl()) ?>"
                 class="checkbox checkbox--link"
             >
-                <svg class="checkbox__icon">
+                <svg class="checkbox__icon" role="img">
+                    <title><?= __('Close') ?></title>
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
                 </svg>
                 <span class="checkbox__label">
diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index e9c829019..4f1bd464c 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -1,6 +1,6 @@
 <?php $_filters = $block->getActiveFilters() ?>
 <button
-    class="button button button--secondary filters__skip-button"
+    class="button button--secondary filters__skip-button"
     type="button"
     data-mage-init='{"skipFilters": {}}'
 >
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index 59bc3ea05..40a34535a 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -38,9 +38,8 @@
                         "
                         title="<?= $_item['label'] ?>"
                     >
-                        <svg
-                            class="checkbox__icon"
-                        >
+                        <svg class="checkbox__icon" role="img">
+                            <title><?= __('Checked') ?></title>
                             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
                         </svg>
                         <span class="checkbox__label">

From 2d9c1d05f79542b47c877d1ec34769cedbfe2ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 17:00:47 +0100
Subject: [PATCH 16/69] Change components version back to develop

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 3ed7d1187..59cf51326 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "require": {
       "magento/framework": "*",
       "snowdog/frontools": "^1.6",
-      "snowdog/module-alpaca-components": "^1.1",
+      "snowdog/module-alpaca-components": "dev-develop",
       "snowdog/module-menu": "^2.4"
     },
     "autoload": {

From abc2500edc63f6ff16f06ab241e08a17398e1b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 18:00:59 +0100
Subject: [PATCH 17/69] #46308 - Add filter name to disable filter aria-label

---
 .../templates/layer/state.phtml                    | 14 ++++++++++++--
 .../templates/filters/list.phtml                   | 14 ++++++++++++--
 .../templates/filters/visual_swatch.phtml          | 14 ++++++++++++--
 3 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index 4f1bd464c..671b789e3 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -21,8 +21,18 @@
                     <a
                         href="<?= $_filter->getRemoveUrl() ?>"
                         class="active-filters__remove"
-                        aria-label="<?= __('Disable filter') . ': ' . $block->stripTags($_filter->getLabel()) ?>"
-                        title="<?= __('Disable filter') . ': ' . $block->stripTags($_filter->getLabel()) ?>"
+                        aria-label="<?= __('Disable filter')
+                            . ': '
+                            . $block->escapeHtml(__($_filter->getName()))
+                            . ' - '
+                            . $block->stripTags($_filter->getLabel())
+                        ?>"
+                        title="<?= __('Disable filter')
+                            . ': '
+                            . $block->escapeHtml(__($_filter->getName()))
+                            . ' - '
+                            . $block->stripTags($_filter->getLabel())
+                        ?>"
                     >
                         <svg class="icon active-filters__remove-icon" role="img">
                             <title><?= __('Close') ?></title>
diff --git a/Snowdog_SolrNavigation/templates/filters/list.phtml b/Snowdog_SolrNavigation/templates/filters/list.phtml
index 542b62c17..2872096d9 100644
--- a/Snowdog_SolrNavigation/templates/filters/list.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/list.phtml
@@ -4,8 +4,18 @@
         <a
             href="<?= $block->getCleanUrl($valueId) ?>"
             class="active-filters__remove"
-            aria-label="<?= __('Disable filter') . ': ' . $valueLabel ?>"
-            title="<?= __('Disable filter') . ': ' . $valueLabel ?>"
+            aria-label="<?= __('Disable filter')
+                . ': '
+                . $block->getLabel()
+                . ' - '
+                . $valueLabel
+            ?>"
+            title="<?= __('Disable filter')
+                . ': '
+                . $block->getLabel()
+                . ' - '
+                . $valueLabel
+            ?>"
         >
             <svg class="icon active-filters__remove-icon" role="img">
                 <title><?= __('Close') ?></title>
diff --git a/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
index 01a78516b..ba8de3dd5 100644
--- a/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/visual_swatch.phtml
@@ -4,8 +4,18 @@
         <a
             href="<?= $block->getCleanUrl($valueId) ?>"
             class="active-filters__remove"
-            aria-label="<?= __('Disable filter') . ': ' . $valueData['label'] ?>"
-            title="<?= __('Disable filter') . ': ' . $valueData['label'] ?>"
+            aria-label="<?= __('Disable filter')
+                . ': '
+                . $block->getLabel()
+                . ' - '
+                . $valueData['label']
+            ?>"
+            title="<?= __('Disable filter')
+                . ': '
+                . $block->getLabel()
+                . ' - '
+                . $valueData['label']
+            ?>"
         >
             <svg class="icon active-filters__remove-icon" role="img">
                 <title><?= __('Close') ?></title>

From f5b96e2a4504a2db25b3ae45ef5d5c759e667d95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 18:17:14 +0100
Subject: [PATCH 18/69] #46308 - Remove tabindex from swatches, add title to
 swatch image

---
 Magento_Swatches/templates/product/layered/renderer.phtml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Magento_Swatches/templates/product/layered/renderer.phtml b/Magento_Swatches/templates/product/layered/renderer.phtml
index 6b32efb50..18dde6346 100644
--- a/Magento_Swatches/templates/product/layered/renderer.phtml
+++ b/Magento_Swatches/templates/product/layered/renderer.phtml
@@ -15,7 +15,6 @@
                             aria-label="<?= $label['label'] ?>"
                         >
                             <div
-                                tabindex="-1"
                                 option-type="3"
                                 option-id="<?= $option ?>"
                                 option-label="<?= $label['label'] ?>"
@@ -36,12 +35,12 @@
                             aria-label="<?= $label['label'] ?>"
                         >
                             <div
-                                tabindex="-1"
                                 option-type="2"
                                 option-id="<?= $option ?>"
                                 option-label="<?= $label['label'] ?>"
                                 option-tooltip-thumb="<?= $swatchThumbPath ?>"
                                 style="background: url(<?= $swatchImagePath ?>) no-repeat center; background-size: cover;"
+                                title="<?= $label['label'] ?>"
                             ></div>
                         </a>
                     </li>
@@ -57,7 +56,6 @@
                         >
                             <div
                                 class="filter__color-sample"
-                                tabindex="-1"
                                 option-type="1"
                                 option-id="<?= $option ?>"
                                 option-label="<?= $label['label'] ?>"

From c3bd54800cf64c0e19c09698be140615f76e5f15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 18:25:11 +0100
Subject: [PATCH 19/69] #46308 - Remove unnecessary aria-labels

---
 Magento_Swatches/templates/product/layered/renderer.phtml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Magento_Swatches/templates/product/layered/renderer.phtml b/Magento_Swatches/templates/product/layered/renderer.phtml
index 18dde6346..450008e48 100644
--- a/Magento_Swatches/templates/product/layered/renderer.phtml
+++ b/Magento_Swatches/templates/product/layered/renderer.phtml
@@ -51,7 +51,6 @@
                     <li class="filter__color-item">
                         <a
                             href="<?= $label['link'] ?>"
-                            aria-label="<?= $label['label'] ?>"
                             class="filter__color-option"
                         >
                             <div
@@ -75,7 +74,6 @@
                     <li class="filter__swatch-item">
                         <a
                             href="<?= $label['link'] ?>"
-                            aria-label="<?= $label['label'] ?>"
                             class="filter__swatch-option"
                             option-type="0"
                             option-id="<?= $option ?>"

From 06e3b9d94676bff486a387308842380640de0929 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 18:43:12 +0100
Subject: [PATCH 20/69] #46308 - Change role to 'presentation' for each icon
 within dropdown item

---
 Magento_Directory/templates/currency.phtml                | 3 +--
 Magento_LayeredNavigation/templates/layer/view.phtml      | 5 ++---
 Magento_Theme/templates/footer/footer-links.phtml         | 8 ++++----
 Snowdog_SolrNavigation/templates/navigation.phtml         | 2 +-
 .../templates/navigation/categories.phtml                 | 3 +--
 Snowdog_SolrNavigation/templates/navigation/list.phtml    | 6 ++----
 Snowdog_SolrNavigation/templates/navigation/range.phtml   | 3 +--
 .../templates/navigation/visual_swatch.phtml              | 6 ++----
 8 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/Magento_Directory/templates/currency.phtml b/Magento_Directory/templates/currency.phtml
index 213d9c197..9c4e5b825 100644
--- a/Magento_Directory/templates/currency.phtml
+++ b/Magento_Directory/templates/currency.phtml
@@ -23,8 +23,7 @@
                   aria-controls="language-<?= $block->escapeHtml($block->getCurrentCurrencyCode()) ?>"
             >
                 <?= __('Currency') ?>: <?= $block->escapeHtml($currentCurrencyCode) ?> - <?= @$block->escapeHtml($currencies[$currentCurrencyCode]) ?>
-                <svg class="dropdown-list__icon dropdown-list__icon--inner" role="img">
-                    <title><?= __('Currency') ?></title>
+                <svg class="dropdown-list__icon dropdown-list__icon--inner" role="presentation">
                     <use xlink:href="<?= $block->getViewFileUrl('images/icons-sprite.svg#arrow-down'); ?>"></use>
                 </svg>
             </span>
diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
index 670fa3011..9758bd71d 100644
--- a/Magento_LayeredNavigation/templates/layer/view.phtml
+++ b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -14,7 +14,7 @@
             data-state-current="hidden"
         >
             <?= __('Shopping Options') ?>
-            <svg class="icon filters__switcher-icon">
+            <svg class="icon filters__switcher-icon" role="presentation">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </button>
@@ -56,8 +56,7 @@
                                 <h3 class="filter__label-title">
                                     <?= $block->escapeHtml(__($filter->getName())) ?>
                                 </h3>
-                                <svg class="icon dropdown-list__icon" role="img">
-                                    <title><?= __('Arrow down') ?></title>
+                                <svg class="icon dropdown-list__icon" role="presentation">
                                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                                 </svg>
                             </button>
diff --git a/Magento_Theme/templates/footer/footer-links.phtml b/Magento_Theme/templates/footer/footer-links.phtml
index 878938492..aee597348 100644
--- a/Magento_Theme/templates/footer/footer-links.phtml
+++ b/Magento_Theme/templates/footer/footer-links.phtml
@@ -21,7 +21,7 @@
                     aria-controls="dropdown-help"
             >
                 <?= __('Help') ?>
-                <svg class="dropdown-list__icon">
+                <svg class="dropdown-list__icon" role="presentation">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
@@ -67,7 +67,7 @@
                 aria-controls="dropdown-info"
             >
                 <?= __('Information') ?>
-                <svg class="dropdown-list__icon">
+                <svg class="dropdown-list__icon" role="presentation">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
@@ -112,7 +112,7 @@
                 aria-controls="dropdown-worth"
             >
                 <?= __('Why is worth it') ?>
-                <svg class="dropdown-list__icon">
+                <svg class="dropdown-list__icon" role="presentation">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
@@ -157,7 +157,7 @@
                 aria-controls="dropdown-alpaca"
             >
                 <?= __('Alpaca.pl') ?>
-                <svg class="dropdown-list__icon">
+                <svg class="dropdown-list__icon" role="presentation">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
                 </svg>
             </button>
diff --git a/Snowdog_SolrNavigation/templates/navigation.phtml b/Snowdog_SolrNavigation/templates/navigation.phtml
index 9fc8ae9fc..ee6fa42c2 100755
--- a/Snowdog_SolrNavigation/templates/navigation.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation.phtml
@@ -9,7 +9,7 @@ $facets = $this->getFacets();
         data-state-current="hidden"
     >
         <?= __('Shopping Options') ?>
-        <svg class="icon filters__switcher-icon">
+        <svg class="icon filters__switcher-icon" role="presentation">
             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
         </svg>
     </button>
diff --git a/Snowdog_SolrNavigation/templates/navigation/categories.phtml b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
index 7509f01a3..a940cce55 100644
--- a/Snowdog_SolrNavigation/templates/navigation/categories.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/categories.phtml
@@ -19,8 +19,7 @@ $subCategories = $block->getSubCategories(2)
             <h3 class="filter__label-title">
                 <?= __('Category') ?>
             </h3>
-            <svg class="icon dropdown-list__icon" role="img">
-                <title><?= __('Arrow down') ?></title>
+            <svg class="icon dropdown-list__icon" role="presentation">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </button>
diff --git a/Snowdog_SolrNavigation/templates/navigation/list.phtml b/Snowdog_SolrNavigation/templates/navigation/list.phtml
index 40a34535a..6d85ff61b 100644
--- a/Snowdog_SolrNavigation/templates/navigation/list.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/list.phtml
@@ -16,8 +16,7 @@
         <h3 class="filter__label-title">
             <?= $block->getAttributeLabel() ?>
         </h3>
-        <svg class="icon dropdown-list__icon" role="img">
-            <title><?= __('Arrow down') ?></title>
+        <svg class="icon dropdown-list__icon" role="presentation">
             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
         </svg>
     </button>
@@ -38,8 +37,7 @@
                         "
                         title="<?= $_item['label'] ?>"
                     >
-                        <svg class="checkbox__icon" role="img">
-                            <title><?= __('Checked') ?></title>
+                        <svg class="checkbox__icon" role="presentation">
                             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
                         </svg>
                         <span class="checkbox__label">
diff --git a/Snowdog_SolrNavigation/templates/navigation/range.phtml b/Snowdog_SolrNavigation/templates/navigation/range.phtml
index 3e0af97c4..697579dd9 100644
--- a/Snowdog_SolrNavigation/templates/navigation/range.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/range.phtml
@@ -17,8 +17,7 @@ $_min = number_format($block->getMin(), 2);
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
-            <svg class="icon dropdown-list__icon" role="img">
-                <title><?= __('Arrow down') ?></title>
+            <svg class="icon dropdown-list__icon" role="presentation">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </button>
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index a91dcaee4..65cc15ae8 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -19,8 +19,7 @@
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
-            <svg class="icon dropdown-list__icon" role="img">
-                <title><?= __('Arrow down') ?></title>
+            <svg class="icon dropdown-list__icon" role="presentation">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </button>
@@ -64,8 +63,7 @@
             <h3 class="filter__label-title">
                 <?= $block->getAttributeLabel() ?>
             </h3>
-            <svg class="icon dropdown-list__icon" role="img">
-                <title><?= __('Arrow down') ?></title>
+            <svg class="icon dropdown-list__icon" role="presentation">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
             </svg>
         </button>

From 0f044ef8319e292536d7cfee4c11c6c6fa10a019 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 18:48:44 +0100
Subject: [PATCH 21/69] #46308 - Change filters heading to h2

---
 Magento_LayeredNavigation/templates/layer/state.phtml | 4 ++--
 Snowdog_SolrNavigation/templates/filters.phtml        | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index 671b789e3..d4d821e68 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -7,9 +7,9 @@
     <?= __('Skip to products') ?>
 </button>
 <?php if (!empty($_filters)): ?>
-    <h1 class="filters__heading">
+    <h2 class="filters__heading">
         <?= __('Now Shopping by') ?>
-    </h1>
+    </h2>
     <div class="divider filters__divider">
         <span class="divider__left"></span>
         <span class="divider__right"></span>
diff --git a/Snowdog_SolrNavigation/templates/filters.phtml b/Snowdog_SolrNavigation/templates/filters.phtml
index df5e1fa81..2ea93c355 100644
--- a/Snowdog_SolrNavigation/templates/filters.phtml
+++ b/Snowdog_SolrNavigation/templates/filters.phtml
@@ -10,9 +10,9 @@ $filters = $block->getFilterBlocks();
     <?= __('Skip to products') ?>
 </button>
 <?php if (!empty($filters)): ?>
-    <h1 class="filters__heading">
+    <h2 class="filters__heading">
         <?= __('Now Shopping by') ?>
-    </h1>
+    </h2>
     <div class="divider filters__divider">
         <span class="divider__left"></span>
         <span class="divider__right"></span>

From 7f1fa47307f335801bdc4bcaf233f896df079ca8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 18:54:56 +0100
Subject: [PATCH 22/69] #46308 - Add role="presentation" to close filter icon

---
 Snowdog_SolrNavigation/templates/filters/list.phtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Snowdog_SolrNavigation/templates/filters/list.phtml b/Snowdog_SolrNavigation/templates/filters/list.phtml
index 2872096d9..697759a2b 100644
--- a/Snowdog_SolrNavigation/templates/filters/list.phtml
+++ b/Snowdog_SolrNavigation/templates/filters/list.phtml
@@ -17,8 +17,7 @@
                 . $valueLabel
             ?>"
         >
-            <svg class="icon active-filters__remove-icon" role="img">
-                <title><?= __('Close') ?></title>
+            <svg class="icon active-filters__remove-icon" role="presentation">
                 <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#close') ?>"></use>
             </svg>
         </a>

From bc40527063d3fd1309475e9a97d1141e1953b308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 8 Jan 2019 19:05:57 +0100
Subject: [PATCH 23/69] #46308 - Remove unnecessary aria-labels, add li tag

---
 .../templates/layer/filter.phtml              |  3 +--
 .../templates/layer/state.phtml               | 19 ++++++++++---------
 .../templates/navigation/visual_swatch.phtml  |  2 --
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Magento_LayeredNavigation/templates/layer/filter.phtml b/Magento_LayeredNavigation/templates/layer/filter.phtml
index 0cafed447..822841435 100644
--- a/Magento_LayeredNavigation/templates/layer/filter.phtml
+++ b/Magento_LayeredNavigation/templates/layer/filter.phtml
@@ -5,8 +5,7 @@
                 href="<?= $block->escapeUrl($filterItem->getUrl()) ?>"
                 class="checkbox checkbox--link"
             >
-                <svg class="checkbox__icon" role="img">
-                    <title><?= __('Close') ?></title>
+                <svg class="checkbox__icon" role="presentation">
                     <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#checked') ?>"></use>
                 </svg>
                 <span class="checkbox__label">
diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
index d4d821e68..847712145 100644
--- a/Magento_LayeredNavigation/templates/layer/state.phtml
+++ b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -34,8 +34,7 @@
                             . $block->stripTags($_filter->getLabel())
                         ?>"
                     >
-                        <svg class="icon active-filters__remove-icon" role="img">
-                            <title><?= __('Close') ?></title>
+                        <svg class="icon active-filters__remove-icon" role="presentation">
                             <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#close') ?>"></use>
                         </svg>
                     </a>
@@ -47,13 +46,15 @@
                     </span>
                 </li>
             <?php endforeach ?>
-            <a
-                href="<?= $block->getClearUrl() ?>"
-                class="active-filters__clear-all"
-                title="<?= __('Clear all filters') ?>"
-            >
-                <?= __('Clear All') ?>
-            </a>
+            <li>
+                <a
+                    href="<?= $block->getClearUrl() ?>"
+                    class="active-filters__clear-all"
+                    title="<?= __('Clear all filters') ?>"
+                >
+                    <?= __('Clear All') ?>
+                </a>
+            </li>
         </ul>
     </div>
 <?php endif ?>
diff --git a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
index 65cc15ae8..af5177774 100644
--- a/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
+++ b/Snowdog_SolrNavigation/templates/navigation/visual_swatch.phtml
@@ -37,7 +37,6 @@
                                 filter__color-option
                                 <?= $block->isActive($_item['value_id']) ? 'filter__color-option--active' : '' ?>
                             "
-                            aria-label="<?= $_item['label'] ?>"
                             title="<?= $_item['label'] ?>"
                         >
                             <div
@@ -81,7 +80,6 @@
                                 filter__swatch-option
                                 <?= $block->isActive($_item['value_id']) ? 'filter__swatch-option--active' : '' ?>
                             "
-                            aria-label="<?= $_item['label'] ?>"
                             title="<?= $_item['label'] ?>"
                         >
                             <?= $_item['label'] ?>

From 32e21f49c3ca3f805f36c35b3d3b69115ca9e656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Szafra=C5=84ski?= <pawel.szafranski@snow.dog>
Date: Wed, 9 Jan 2019 15:39:59 +0100
Subject: [PATCH 24/69] Fixed duplicated email id on company users view

---
 CHANGELOG.md                                                  | 2 ++
 .../templates/company/management/dialog/customer/add.phtml    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a6fae056f..22e3d1713 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+### Fixed
+- Duplicated `email` id on company users view
 
 ## [1.1.0] - 2019-01-07
 ### Added
diff --git a/Magento_Company/templates/company/management/dialog/customer/add.phtml b/Magento_Company/templates/company/management/dialog/customer/add.phtml
index 46e596dc4..b6ea89ba0 100644
--- a/Magento_Company/templates/company/management/dialog/customer/add.phtml
+++ b/Magento_Company/templates/company/management/dialog/customer/add.phtml
@@ -72,13 +72,13 @@
             >
         </div>
         <div class="field input email required">
-            <label class="label" for="email">
+            <label class="label" for="add-user-email">
                 <?= $block->escapeHtml(__('Email')) ?>
             </label>
             <input
                 type="email"
                 name="email"
-                id="email"
+                id="add-user-email"
                 value=""
                 title="<?= $block->escapeHtml(__('Email')) ?>"
                 data-role="email"

From 979417f8c4e3c0b48313d6ec7fc9069c3c7fcd1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 9 Jan 2019 16:47:34 +0100
Subject: [PATCH 25/69] #46308 - Set focus to first focusable element in
 dropdown content

---
 Magento_Theme/web/js/dropdown-list.babel.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/Magento_Theme/web/js/dropdown-list.babel.js b/Magento_Theme/web/js/dropdown-list.babel.js
index 918c15587..c992dca8c 100755
--- a/Magento_Theme/web/js/dropdown-list.babel.js
+++ b/Magento_Theme/web/js/dropdown-list.babel.js
@@ -44,15 +44,17 @@ class DropdownList {
     }
   }
 
-  toggleContent(trigger, dropdownContent, closing) {
-    const dropdownBlock = trigger.closest('.dropdown-list');
+  toggleContent(trigger, dropdownContent, opening) {
+    const dropdownBlock = trigger.closest('.dropdown-list'),
+          focusableElements = dropdownContent.querySelectorAll('button:not([disabled]), a[href], area[href] input:not([disabled]), select:not([disabled]), textarea:not([disabled]), *[tabindex]:not([tabindex="-1"]), object, embed, *[contenteditable]');
 
     if (!this.isMediumOpen(dropdownBlock)) {
       if (dropdownContent.clientHeight > 0) {
         this.setAriaAttributes(trigger, dropdownContent, true);
         trigger.focus();
-      } else if (!closing) {
+      } else if (opening) {
         this.setAriaAttributes(trigger, dropdownContent, false);
+        focusableElements[0].focus();
       }
     }
   }
@@ -71,12 +73,12 @@ class DropdownList {
 
       key.addEventListener('click', e => {
         e.preventDefault();
-        this.toggleContent(key, dropdownContent);
+        this.toggleContent(key, dropdownContent, true);
       }, false);
 
       [key, dropdownContent].forEach(el => el.addEventListener('keydown', e => {
         if (e.key === "Escape") {
-          this.toggleContent(key, dropdownContent, true);
+          this.toggleContent(key, dropdownContent, false);
         }
       }));
     });

From 7cbe886eb3a3a0ba7c7c49b43f2653be41813bd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 9 Jan 2019 16:56:13 +0100
Subject: [PATCH 26/69] Update changelog

---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22bde33ac..e708709c8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,9 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Support for escape key in dropdown script
 
+### Changed
+- Refactor filters and accessibility improvements
+
 ### Fixed
 - Duplicated `email` id on company users view
 
@@ -27,7 +30,6 @@ All notable changes to this project will be documented in this file.
 - Refactor dropdown list and nested list
 - Grid classes in whole project
 - Refactor menu and submenu templates
-- Refactor filters and accessibility improvements
 
 ## [1.0.0] - 2018-10-15
 ### Changed

From e585c3f5441b91535f2521336b2471fabee1591c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Szafra=C5=84ski?= <pawel.szafranski@snow.dog>
Date: Thu, 10 Jan 2019 14:03:24 +0100
Subject: [PATCH 27/69] Fixed duplicated wishlist section

---
 CHANGELOG.md                                     | 1 +
 Magento_Catalog/layout/catalog_category_view.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e708709c8..835733256 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file.
 
 ### Fixed
 - Duplicated `email` id on company users view
+- Duplicated `My wishlist` section in sidebar
 
 ## [1.1.0] - 2019-01-07
 ### Added
diff --git a/Magento_Catalog/layout/catalog_category_view.xml b/Magento_Catalog/layout/catalog_category_view.xml
index 0705ea5fa..9c6fee835 100644
--- a/Magento_Catalog/layout/catalog_category_view.xml
+++ b/Magento_Catalog/layout/catalog_category_view.xml
@@ -13,6 +13,7 @@
         <!-- Restored blocks -->
         <referenceBlock name="sale.reorder.sidebar" remove="false"/>
         <referenceBlock name="wishlist_sidebar" remove="false"/>
+        <referenceBlock name="multiple-wishlist_sidebar" remove="true"/>
         <referenceBlock name="catalog.compare.sidebar" remove="false"/>
 
         <!-- Moved blocks -->

From 3803b204d29b19aa355859642921ae4b80cc6f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Szafra=C5=84ski?= <pawel.szafranski@snow.dog>
Date: Thu, 10 Jan 2019 15:03:51 +0100
Subject: [PATCH 28/69] Removed category.product.addto.requisition from catalog
 view

---
 Magento_Catalog/layout/catalog_category_view.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Magento_Catalog/layout/catalog_category_view.xml b/Magento_Catalog/layout/catalog_category_view.xml
index 9c6fee835..1a538cbdc 100644
--- a/Magento_Catalog/layout/catalog_category_view.xml
+++ b/Magento_Catalog/layout/catalog_category_view.xml
@@ -15,6 +15,7 @@
         <referenceBlock name="wishlist_sidebar" remove="false"/>
         <referenceBlock name="multiple-wishlist_sidebar" remove="true"/>
         <referenceBlock name="catalog.compare.sidebar" remove="false"/>
+        <referenceBlock name="category.product.addto.requisition" remove="true"/>
 
         <!-- Moved blocks -->
         <move element="div.sidebar.main" destination="columns" before="main"/>

From a6358e54b3d5dadd2882048edc44246e76cb4a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 11 Jan 2019 17:28:46 +0100
Subject: [PATCH 29/69] #49111 - Move footer content to module-menu templates

---
 Magento_Theme/layout/default.xml              |  12 +-
 .../templates/footer/footer-links.phtml       | 199 ------------------
 Magento_Theme/templates/footer/footer.phtml   |   2 +-
 Snowdog_Menu/templates/main-footer/menu.phtml |  30 +++
 .../main-footer/menu/node_type/category.phtml |  37 ++++
 .../main-footer/menu/node_type/cms_page.phtml |  36 ++++
 .../menu/node_type/custom_url.phtml           |  32 +++
 .../templates/main-footer/menu/sub_menu.phtml |  40 ++++
 8 files changed, 182 insertions(+), 206 deletions(-)
 delete mode 100644 Magento_Theme/templates/footer/footer-links.phtml
 create mode 100644 Snowdog_Menu/templates/main-footer/menu.phtml
 create mode 100644 Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml
 create mode 100644 Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml
 create mode 100644 Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml
 create mode 100644 Snowdog_Menu/templates/main-footer/menu/sub_menu.phtml

diff --git a/Magento_Theme/layout/default.xml b/Magento_Theme/layout/default.xml
index 1b6ab81e6..6240f99b3 100644
--- a/Magento_Theme/layout/default.xml
+++ b/Magento_Theme/layout/default.xml
@@ -63,18 +63,18 @@
                 template="Magento_Theme::footer/footer.phtml"
                 after="main.content"
             >
+                <block name="footer-menu" class="Snowdog\Menu\Block\Menu">
+                    <arguments>
+                        <argument name="menu" xsi:type="string">main-footer</argument>
+                    </arguments>
+                </block>
+
                 <block
                     class="Magento\Newsletter\Block\Subscribe"
                     name="footer-newsletter"
                     template="Magento_Newsletter::subscribe.phtml"
                 />
 
-                <block
-                    class="Magento\Framework\View\Element\Template"
-                    name="footer-links"
-                    template="Magento_Theme::footer/footer-links.phtml"
-                />
-
                 <block
                     class="Magento\Framework\View\Element\Template"
                     name="social-links"
diff --git a/Magento_Theme/templates/footer/footer-links.phtml b/Magento_Theme/templates/footer/footer-links.phtml
deleted file mode 100644
index aee597348..000000000
--- a/Magento_Theme/templates/footer/footer-links.phtml
+++ /dev/null
@@ -1,199 +0,0 @@
-<!-- This should be moved to CMS Menu when customising features will be available. This file is temporary -->
-<div
-    class="
-        dropdown-list
-        dropdown-list@screen-m
-        dropdown-list--is-open@screen-m
-        dropdown-list--dark
-        js-is-medium-open
-    "
-    data-mage-init='{ "dropdownList": {} }'
->
-    <ul class="dropdown-list__list">
-        <li class="
-                dropdown-list__item
-                dropdown-list__item--collapse
-            "
-        >
-            <button class="dropdown-list__label"
-                    type="button"
-                    aria-expanded="false"
-                    aria-controls="dropdown-help"
-            >
-                <?= __('Help') ?>
-                <svg class="dropdown-list__icon" role="presentation">
-                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
-                </svg>
-            </button>
-            <div id="dropdown-help" class="dropdown-list__content" aria-hidden="true">
-                <ul class="list footer__links-list">
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Contact') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Frequently asked questions (FAQ)') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('How to buy') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Track your package') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Guides') ?>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </li>
-        <li class="
-                dropdown-list__item
-                dropdown-list__item--collapse
-            "
-        >
-            <button
-                class="dropdown-list__label"
-                type="button"
-                aria-expanded="false"
-                aria-controls="dropdown-info"
-            >
-                <?= __('Information') ?>
-                <svg class="dropdown-list__icon" role="presentation">
-                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
-                </svg>
-            </button>
-            <div
-                id="dropdown-info"
-                class="dropdown-list__content"
-                aria-hidden="true"
-            >
-                <ul class="list footer__links-list">
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Delivery time') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Payments') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Delivery cost') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Returns and exchanges') ?>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </li>
-        <li class="
-                dropdown-list__item
-                dropdown-list__item--collapse
-            "
-        >
-            <button
-                class="dropdown-list__label"
-                type="button"
-                aria-expanded="false"
-                aria-controls="dropdown-worth"
-            >
-                <?= __('Why is worth it') ?>
-                <svg class="dropdown-list__icon" role="presentation">
-                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
-                </svg>
-            </button>
-            <div
-                id="dropdown-worth"
-                class="dropdown-list__content"
-                aria-hidden="true"
-            >
-                <ul class="list footer__links-list">
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('30 days for return') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Guarantee') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('454 Brands') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Discounts') ?>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </li>
-        <li class="
-                dropdown-list__item
-                dropdown-list__item--collapse
-            "
-        >
-            <button
-                class="dropdown-list__label"
-                type="button"
-                aria-expanded="false"
-                aria-controls="dropdown-alpaca"
-            >
-                <?= __('Alpaca.pl') ?>
-                <svg class="dropdown-list__icon" role="presentation">
-                    <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
-                </svg>
-            </button>
-            <div
-                id="dropdown-alpaca"
-                class="dropdown-list__content"
-                aria-hidden="true"
-            >
-                <ul class="list footer__links-list">
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('About us') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Certificates and safety') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Prizes and customer feedback') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Cookie policy') ?>
-                        </a>
-                    </li>
-                    <li class="list__item">
-                        <a href="#" class="link footer__link">
-                            <?= __('Regulations') ?>
-                        </a>
-                    </li>
-                </ul>
-            </div>
-        </li>
-    </ul>
-</div>
diff --git a/Magento_Theme/templates/footer/footer.phtml b/Magento_Theme/templates/footer/footer.phtml
index 2f979cd79..0ae82c1e3 100644
--- a/Magento_Theme/templates/footer/footer.phtml
+++ b/Magento_Theme/templates/footer/footer.phtml
@@ -3,7 +3,7 @@
         <?= $this->getChildHtml('footer-newsletter') ?>
     </section>
     <section class="footer__links col-xs-12 col-lg-9">
-        <?= $this->getChildHtml('footer-links') ?>
+        <?= $this->getChildHtml('footer-menu') ?>
     </section>
 </div>
 <section class="footer__bottom-bar">
diff --git a/Snowdog_Menu/templates/main-footer/menu.phtml b/Snowdog_Menu/templates/main-footer/menu.phtml
new file mode 100644
index 000000000..8a723dc8b
--- /dev/null
+++ b/Snowdog_Menu/templates/main-footer/menu.phtml
@@ -0,0 +1,30 @@
+<?php /** @var \Snowdog\Menu\Block\Menu $block */ ?>
+<?php if ($block->getMenu()): ?>
+    <?php $menuClass = $block->getMenu()->getCssClass() ?>
+    <div
+        class="
+            <?= $menuClass ?>
+            <?= $menuClass ?>@screen-m
+            <?= $menuClass ?>--is-open@screen-m
+            <?= $menuClass ?>--dark
+        "
+        data-mage-init='{ "dropdownList": {} }'
+    >
+        <ul class="<?= $menuClass ?>__list">
+            <?php foreach ($block->getNodes() as $node): ?>
+                <?php
+                    $childrenLevel = $node->getLevel() + 1;
+                    $children = $this->getNodes($childrenLevel, $node);
+                    $node->setIsParent((bool) $children);
+                    $parentClass = $children ? ' ' . $menuClass . '__item--collapse' : '';
+                    $additionalClasses = $node->getClasses() ? ' ' . $node->getClasses() : '';
+                    $itemClasses = $parentClass . $additionalClasses;
+                ?>
+                <li class="<?= $menuClass ?>__item<?= $itemClasses ?>">
+                    <?= $block->renderMenuNode($node) ?>
+                    <?= $block->renderSubmenu($children, $node, $childrenLevel) ?>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
+<?php endif ?>
diff --git a/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml b/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml
new file mode 100644
index 000000000..476f2226b
--- /dev/null
+++ b/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml
@@ -0,0 +1,37 @@
+<?php /** @var \Snowdog\Menu\Block\NodeType\Category $block */ ?>
+<?php
+    $nodeId = $block->getId();
+    $class = $block->getMenuClass();
+    $categoryUrl = $block->getCategoryUrl($nodeId);
+    $categoryUrl = $categoryUrl ?: '#';
+    $dataAttribute = '';
+
+
+    $classLink = $block->getIsRoot() ? $class . '__label' : 'link footer__link';
+    $title = $block->getTitle();
+
+    if ($nodeId) {
+        $dataAttribute = ' aria-controls="dropdown-' . $nodeId . '"';
+    }
+
+    if ($block->isCurrentCategory($nodeId)) {
+        $classLink .= ' footer__link--current';
+    }
+?>
+
+<?php if ($block->getIsRoot()): ?>
+    <button type="button" class="<?= $classLink ?>" <?= $dataAttribute ?>>
+        <?= $title ?>
+        <svg class="dropdown-list__icon" role="presentation">
+            <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
+        </svg>
+    </button>
+<?php else: ?>
+    <a
+        href="<?= $categoryUrl ?>"
+        class="<?= $classLink ?>"
+        <?= $dataAttribute ?>
+    >
+        <?= $title ?>
+    </a>
+<?php endif; ?>
diff --git a/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml b/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml
new file mode 100644
index 000000000..134c1f599
--- /dev/null
+++ b/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml
@@ -0,0 +1,36 @@
+<?php /** @var \Snowdog\Menu\Block\NodeType\CmsPage $block */ ?>
+<?php
+    $nodeId = $block->getId();
+    $class = $block->getMenuClass();
+    $pageUrl = $block->getPageUrl($nodeId);
+    $pageUrl = $pageUrl ?: '#';
+    $dataAttribute = '';
+
+    $classLink = $block->getIsRoot() ? $class . '__label' : 'link footer__link';
+    $title = $block->getTitle();
+
+    if ($nodeId) {
+        $dataAttribute = ' aria-controls="dropdown-' . $nodeId . '"';
+    }
+
+    if ($block->isCurrentPage($nodeId)) {
+        $classLink .= ' footer__link--current';
+    }
+?>
+
+<?php if ($block->getIsRoot()): ?>
+    <button type="button" class="<?= $classLink ?>" <?= $dataAttribute ?>>
+        <?= $title ?>
+        <svg class="dropdown-list__icon" role="presentation">
+            <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
+        </svg>
+    </button>
+<?php else: ?>
+    <a
+        href="<?= $pageUrl ?>"
+        class="<?= $classLink ?>"
+        <?= $dataAttribute ?>
+    >
+        <?= $title ?>
+    </a>
+<?php endif; ?>
diff --git a/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml b/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml
new file mode 100644
index 000000000..fe4ef092e
--- /dev/null
+++ b/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml
@@ -0,0 +1,32 @@
+<?php /** @var \Snowdog\Menu\Block\NodeType\CustomUrl $block */ ?>
+<?php
+    $attributes = [];
+    $class = $block->getMenuClass();
+    $classLink = $block->getIsRoot() ? $class . '__label' : 'link footer__link';
+    $title = $block->getTitle();
+    if ($block->getId()) {
+        $attributes[] = 'aria-controls="dropdown-' . $block->getId() . '"';
+    }
+
+    $attributes[] = 'class="' . $classLink . '"';
+
+    if ($block->getTarget()) {
+        $attributes[] = 'target="__blank" rel="noopener"';
+    }
+?>
+
+<?php if ($block->getIsRoot()): ?>
+    <button type="button" <?= implode(' ', $attributes) ?>>
+        <?= $title ?>
+        <svg class="dropdown-list__icon" role="presentation">
+            <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#angle-down') ?>"></use>
+        </svg>
+    </button>
+<?php else: ?>
+    <a
+        href="<?= $block->getContent() ?>"
+        <?= implode(' ', $attributes) ?>
+    >
+        <?= $title ?>
+    </a>
+<?php endif; ?>
diff --git a/Snowdog_Menu/templates/main-footer/menu/sub_menu.phtml b/Snowdog_Menu/templates/main-footer/menu/sub_menu.phtml
new file mode 100644
index 000000000..58d6b2d92
--- /dev/null
+++ b/Snowdog_Menu/templates/main-footer/menu/sub_menu.phtml
@@ -0,0 +1,40 @@
+<?php /** @var \Snowdog\Menu\Block\Menu $block */ ?>
+<?php if ($block->getMenu()): ?>
+    <?php
+        $menuClass = $block->getMenu()->getCssClass();
+        $parentNode = $block->getParentNode();
+        $level = $block->getLevel();
+
+        $wrapperAttributes = [
+            'class' => [
+                $menuClass . '__content',
+            ],
+            'id' => 'dropdown-' . $parentNode->getNodeId()
+        ];
+    ?>
+    <div <?= $block->buildAttrFromArray($wrapperAttributes) ?>>
+        <ul class="list footer__links-list">
+            <?php foreach ($block->getSubmenuNodes() as $node): ?>
+                <?php
+                    $childrenLevel = $node->getLevel() + 1;
+                    $children = $this->getNodes($childrenLevel, $node);
+                    $node->setIsParent((bool) $children);
+
+                    $nodeAttributes = [
+                        'class' => [
+                            'list__item'
+                        ]
+                    ];
+
+                    if ($node->getClasses()) {
+                        $nodeAttributes['class'][] = $node->getClasses();
+                    }
+                ?>
+                <li <?= $block->buildAttrFromArray($nodeAttributes) ?>>
+                    <?= $block->renderMenuNode($node) ?>
+                    <?= $block->renderSubmenu($children, $node, $childrenLevel) ?>
+                </li>
+            <?php endforeach; ?>
+        </ul>
+    </div>
+<?php endif; ?>

From ea9fd99bbf9be502931fe6bfcb2a1e467f5240d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Mon, 21 Jan 2019 16:53:26 +0100
Subject: [PATCH 30/69] #49111 - Remove attributes from submenu links

---
 .../templates/main-footer/menu/node_type/category.phtml     | 6 +-----
 .../templates/main-footer/menu/node_type/cms_page.phtml     | 6 +-----
 .../templates/main-footer/menu/node_type/custom_url.phtml   | 5 +----
 3 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml b/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml
index 476f2226b..18fe8f068 100644
--- a/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml
+++ b/Snowdog_Menu/templates/main-footer/menu/node_type/category.phtml
@@ -27,11 +27,7 @@
         </svg>
     </button>
 <?php else: ?>
-    <a
-        href="<?= $categoryUrl ?>"
-        class="<?= $classLink ?>"
-        <?= $dataAttribute ?>
-    >
+    <a href="<?= $categoryUrl ?>" class="<?= $classLink ?>">
         <?= $title ?>
     </a>
 <?php endif; ?>
diff --git a/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml b/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml
index 134c1f599..940467aaf 100644
--- a/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml
+++ b/Snowdog_Menu/templates/main-footer/menu/node_type/cms_page.phtml
@@ -26,11 +26,7 @@
         </svg>
     </button>
 <?php else: ?>
-    <a
-        href="<?= $pageUrl ?>"
-        class="<?= $classLink ?>"
-        <?= $dataAttribute ?>
-    >
+    <a href="<?= $pageUrl ?>" class="<?= $classLink ?>">
         <?= $title ?>
     </a>
 <?php endif; ?>
diff --git a/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml b/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml
index fe4ef092e..3b8170c97 100644
--- a/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml
+++ b/Snowdog_Menu/templates/main-footer/menu/node_type/custom_url.phtml
@@ -23,10 +23,7 @@
         </svg>
     </button>
 <?php else: ?>
-    <a
-        href="<?= $block->getContent() ?>"
-        <?= implode(' ', $attributes) ?>
-    >
+    <a href="<?= $block->getContent() ?>" class="<?= $classLink ?>">
         <?= $title ?>
     </a>
 <?php endif; ?>

From 3c78f83b2e09c1921b0eca0999b01d17c6f4ce39 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Mon, 21 Jan 2019 17:06:21 +0100
Subject: [PATCH 31/69] #49111 - Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 835733256..005c4cdea 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
 
 ### Changed
 - Refactor filters and accessibility improvements
+- Connect footer links with module-menu
 
 ### Fixed
 - Duplicated `email` id on company users view

From ee1478cc11e4686fa272b459a2bd467e385a737d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 22 Jan 2019 16:20:42 +0100
Subject: [PATCH 32/69] #49456 - Copy quickorder template

---
 Magento_QuickOrder/templates/widget/sku.phtml | 151 ++++++++++++++++++
 1 file changed, 151 insertions(+)
 create mode 100644 Magento_QuickOrder/templates/widget/sku.phtml

diff --git a/Magento_QuickOrder/templates/widget/sku.phtml b/Magento_QuickOrder/templates/widget/sku.phtml
new file mode 100644
index 000000000..1f0e0a003
--- /dev/null
+++ b/Magento_QuickOrder/templates/widget/sku.phtml
@@ -0,0 +1,151 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+// @codingStandardsIgnoreFile
+
+?>
+<?php
+/**
+ * Order by SKU widget template
+ *
+ * @var $block \Magento\QuickOrder\Block\Sku
+ */
+?>
+ELO
+<div id="<?= /* @noEscape */ $block->getUniqueId() ?>" class="widget block block-addbysku"
+     data-role="block-addbysku"
+     data-mage-init='{
+        "quickOrderItemTable":{
+                "addBlockData":{"widgetId":"<?= /* @noEscape */ $block->getUniqueId() ?>"},
+                "addEvent":"addNewRow",
+                "addSelector":"[data-role=new-block]"
+        }
+     }'>
+    <div data-role="show-errors" class="wrap-sum-errors" data-mage-init='{
+        "countingErrors":{
+                "wrapError":"[data-role=block-addbysku]",
+                "nameErrorBlock":"[data-role=error-message]"
+        }
+     }'></div>
+    <?php if (!$block->getIsTitleHidden()): ?>
+        <div class="block-title">
+            <strong role="heading" aria-level="2"><?= $block->escapeHtml(__('Order by SKU')) ?></strong>
+        </div>
+    <?php endif ?>
+    <div class="block-content">
+        <form
+            class="form form-addbysku"
+            action="<?= /* @noEscape */ $block->getUrl('quickorder/sku/uploadfile') ?>"
+            method="post"
+            data-role="send-sku"
+            data-mage-init='{"validation":{}, "quickOrderAddToCart":{}}'
+            <?php if ($block->getIsMultipart()): ?> enctype="multipart/form-data"<?php endif; ?>
+            >
+            <div class="box box-items">
+                <fieldset class="fieldset" data-container="items">
+
+                    <div class="fields additional deletable-item-title">
+                        <div class="field sku required">
+                            <label class="label">
+                                <span><?= $block->escapeHtml(__('Enter SKU or Product Name')) ?></span>
+                            </label>
+                        </div>
+                        <div class="field qty required">
+                            <label class="label">
+                                <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                            </label>
+                        </div>
+                    </div>
+                </fieldset>
+            </div>
+            <?php if ($block->getChildHtml()): ?>
+                <div class="box box-upload">
+                    <fieldset class="fieldset">
+                        <?= $block->getChildHtml() ?>
+                    </fieldset>
+                </div>
+            <?php endif; ?>
+            <div class="actions-toolbar">
+                <div class="primary">
+                    <button type="submit"
+                            title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
+                            class="action tocart primary"
+                            data-action="submit-sku"
+                            disabled>
+                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                    </button>
+                </div>
+            </div>
+            <?php if ($block->getLink()): ?>
+                <?= /* @noEscape */ $block->getLink() ?>
+            <?php endif; ?>
+        </form>
+        <script data-template="add-block" type="text/x-magento-template">
+            <div class="fields additional deletable-item" data-role="new-block"
+                 data-mage-init='{
+                     "deletableItem":{},
+                     "productSkuItem":{
+                        "rowIndex": "<%- data.rowIndex %>",
+                        "tableWigetSelector":"[data-role=block-addbysku]",
+                        "urlSku":"<?= /* @noEscape */ $block->getUrl('quickorder/ajax/search') ?>"}}'>
+                <div class="field sku required ui-front">
+                    <label class="label">
+                        <span><?= $block->escapeHtml(__('Enter SKU or Product Name')) ?></span>
+                    </label>
+                    <div class="control">
+                        <input type="text"
+                               name="items[<%- data.rowIndex %>][sku]"
+                               id="id-items<%- data.widgetId %><%- data.rowIndex %>sku"
+                               data-id="<%- data.widgetId %><%- data.rowIndex %>sku"
+                               data-sku="true"
+                               aria-required="true"
+                               data-mage-init='{
+                                    "Magento_QuickOrder/js/sku/autocomplete": {
+                                        "sourceUrl": "<?= /* @noEscape */ $block->getUrl('quickorder/ajax/product_suggest') ?>"
+                                    }
+                               }'
+                               data-validate='{
+                                    "required-if-all-sku-empty-and-file-not-loaded": {
+                                        specifiedId: "#customer_sku_csv",
+                                        dataSku: "data-sku"
+                                        }
+                               }'
+                               data-role="product-sku"/>
+
+                    </div>
+                    <div class="product-block" data-role="product-block"></div>
+                </div>
+                <div class="field qty required">
+                    <label class="label">
+                        <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                    </label>
+                    <div class="control">
+                        <input type="number"
+                               name="items[<%- data.rowIndex %>][qty]"
+                               id="id-items<%- data.widgetId %><%- data.rowIndex %>qty"
+                               class="qty"
+                               maxlength="13"
+                               aria-required="true"
+                               data-validate='{
+                                    "required-number-if-specified": "[data-id=<%- data.widgetId %><%- data.rowIndex %>sku]",
+                                    "validate-number": true,
+                                    "validate-greater-than-zero": true,
+                                    "validate-number-range": "0.0001-99999999.9999"
+                                    }'
+                                    data-role="product-qty"/>
+                    </div>
+                </div>
+                <div class="actions-toolbar">
+                    <div class="secondary">
+                        <button type="button" class="action remove" title="<?= $block->escapeHtml(__('Remove Row')) ?>" data-role="delete">
+                            <span><?= $block->escapeHtml(__('Remove Row')) ?></span>
+                        </button>
+                    </div>
+                </div>
+            </div>
+        </script>
+    </div>
+</div>

From d9086f1d30d041725592796a219859b86f5bab46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 22 Jan 2019 16:27:44 +0100
Subject: [PATCH 33/69] #49456 - Quickorder template formatting

---
 Magento_QuickOrder/templates/widget/sku.phtml | 167 ++++++++++--------
 1 file changed, 90 insertions(+), 77 deletions(-)

diff --git a/Magento_QuickOrder/templates/widget/sku.phtml b/Magento_QuickOrder/templates/widget/sku.phtml
index 1f0e0a003..12b06bebe 100644
--- a/Magento_QuickOrder/templates/widget/sku.phtml
+++ b/Magento_QuickOrder/templates/widget/sku.phtml
@@ -1,61 +1,59 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-
-// @codingStandardsIgnoreFile
-
-?>
-<?php
 /**
  * Order by SKU widget template
  *
  * @var $block \Magento\QuickOrder\Block\Sku
  */
 ?>
-ELO
-<div id="<?= /* @noEscape */ $block->getUniqueId() ?>" class="widget block block-addbysku"
-     data-role="block-addbysku"
-     data-mage-init='{
+<div
+    id="<?= $block->getUniqueId() ?>"
+    class="widget block block-addbysku"
+    data-role="block-addbysku"
+    data-mage-init='{
         "quickOrderItemTable":{
-                "addBlockData":{"widgetId":"<?= /* @noEscape */ $block->getUniqueId() ?>"},
-                "addEvent":"addNewRow",
-                "addSelector":"[data-role=new-block]"
+            "addBlockData":{"widgetId":"<?= $block->getUniqueId() ?>"},
+            "addEvent":"addNewRow",
+            "addSelector":"[data-role=new-block]"
         }
-     }'>
-    <div data-role="show-errors" class="wrap-sum-errors" data-mage-init='{
-        "countingErrors":{
-                "wrapError":"[data-role=block-addbysku]",
-                "nameErrorBlock":"[data-role=error-message]"
-        }
-     }'></div>
+    }'
+>
+    <div
+        data-role="show-errors"
+        class="wrap-sum-errors"
+        data-mage-init='{
+            "countingErrors":{
+                    "wrapError":"[data-role=block-addbysku]",
+                    "nameErrorBlock":"[data-role=error-message]"
+            }
+        }'
+    ></div>
     <?php if (!$block->getIsTitleHidden()): ?>
         <div class="block-title">
-            <strong role="heading" aria-level="2"><?= $block->escapeHtml(__('Order by SKU')) ?></strong>
+            <strong role="heading" aria-level="2">
+                <?= __('Order by SKU') ?>
+            </strong>
         </div>
     <?php endif ?>
     <div class="block-content">
         <form
             class="form form-addbysku"
-            action="<?= /* @noEscape */ $block->getUrl('quickorder/sku/uploadfile') ?>"
+            action="<?= $block->getUrl('quickorder/sku/uploadfile') ?>"
             method="post"
             data-role="send-sku"
             data-mage-init='{"validation":{}, "quickOrderAddToCart":{}}'
             <?php if ($block->getIsMultipart()): ?> enctype="multipart/form-data"<?php endif; ?>
-            >
+        >
             <div class="box box-items">
                 <fieldset class="fieldset" data-container="items">
-
                     <div class="fields additional deletable-item-title">
                         <div class="field sku required">
                             <label class="label">
-                                <span><?= $block->escapeHtml(__('Enter SKU or Product Name')) ?></span>
+                                <?= __('Enter SKU or Product Name') ?>
                             </label>
                         </div>
                         <div class="field qty required">
                             <label class="label">
-                                <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                                <?= __('Qty') ?>
                             </label>
                         </div>
                     </div>
@@ -70,78 +68,93 @@ ELO
             <?php endif; ?>
             <div class="actions-toolbar">
                 <div class="primary">
-                    <button type="submit"
-                            title="<?= $block->escapeHtml(__('Add to Cart')) ?>"
-                            class="action tocart primary"
-                            data-action="submit-sku"
-                            disabled>
-                        <span><?= $block->escapeHtml(__('Add to Cart')) ?></span>
+                    <button
+                        type="submit"
+                        title="<?= __('Add to Cart') ?>"
+                        class="action tocart primary"
+                        data-action="submit-sku"
+                        disabled
+                    >
+                        <?= __('Add to Cart') ?>
                     </button>
                 </div>
             </div>
             <?php if ($block->getLink()): ?>
-                <?= /* @noEscape */ $block->getLink() ?>
+                <?= $block->getLink() ?>
             <?php endif; ?>
         </form>
         <script data-template="add-block" type="text/x-magento-template">
-            <div class="fields additional deletable-item" data-role="new-block"
-                 data-mage-init='{
-                     "deletableItem":{},
-                     "productSkuItem":{
+            <div
+                class="fields additional deletable-item"
+                data-role="new-block"
+                data-mage-init='{
+                    "deletableItem":{},
+                    "productSkuItem":{
                         "rowIndex": "<%- data.rowIndex %>",
                         "tableWigetSelector":"[data-role=block-addbysku]",
-                        "urlSku":"<?= /* @noEscape */ $block->getUrl('quickorder/ajax/search') ?>"}}'>
+                        "urlSku":"<?= $block->getUrl('quickorder/ajax/search') ?>"
+                    }
+                }'
+            >
                 <div class="field sku required ui-front">
                     <label class="label">
-                        <span><?= $block->escapeHtml(__('Enter SKU or Product Name')) ?></span>
+                        <?= __('Enter SKU or Product Name') ?>
                     </label>
                     <div class="control">
-                        <input type="text"
-                               name="items[<%- data.rowIndex %>][sku]"
-                               id="id-items<%- data.widgetId %><%- data.rowIndex %>sku"
-                               data-id="<%- data.widgetId %><%- data.rowIndex %>sku"
-                               data-sku="true"
-                               aria-required="true"
-                               data-mage-init='{
-                                    "Magento_QuickOrder/js/sku/autocomplete": {
-                                        "sourceUrl": "<?= /* @noEscape */ $block->getUrl('quickorder/ajax/product_suggest') ?>"
-                                    }
-                               }'
-                               data-validate='{
-                                    "required-if-all-sku-empty-and-file-not-loaded": {
-                                        specifiedId: "#customer_sku_csv",
-                                        dataSku: "data-sku"
-                                        }
-                               }'
-                               data-role="product-sku"/>
-
+                        <input
+                            type="text"
+                            name="items[<%- data.rowIndex %>][sku]"
+                            id="id-items<%- data.widgetId %><%- data.rowIndex %>sku"
+                            data-id="<%- data.widgetId %><%- data.rowIndex %>sku"
+                            data-sku="true"
+                            aria-required="true"
+                            data-mage-init='{
+                                "Magento_QuickOrder/js/sku/autocomplete": {
+                                    "sourceUrl": "<?= $block->getUrl('quickorder/ajax/product_suggest') ?>"
+                                }
+                            }'
+                            data-validate='{
+                                "required-if-all-sku-empty-and-file-not-loaded": {
+                                    specifiedId: "#customer_sku_csv",
+                                    dataSku: "data-sku"
+                                }
+                            }'
+                            data-role="product-sku"
+                        >
                     </div>
                     <div class="product-block" data-role="product-block"></div>
                 </div>
                 <div class="field qty required">
                     <label class="label">
-                        <span><?= $block->escapeHtml(__('Qty')) ?></span>
+                        <?= __('Qty') ?>
                     </label>
                     <div class="control">
-                        <input type="number"
-                               name="items[<%- data.rowIndex %>][qty]"
-                               id="id-items<%- data.widgetId %><%- data.rowIndex %>qty"
-                               class="qty"
-                               maxlength="13"
-                               aria-required="true"
-                               data-validate='{
-                                    "required-number-if-specified": "[data-id=<%- data.widgetId %><%- data.rowIndex %>sku]",
-                                    "validate-number": true,
-                                    "validate-greater-than-zero": true,
-                                    "validate-number-range": "0.0001-99999999.9999"
-                                    }'
-                                    data-role="product-qty"/>
+                        <input
+                            type="number"
+                            name="items[<%- data.rowIndex %>][qty]"
+                            id="id-items<%- data.widgetId %><%- data.rowIndex %>qty"
+                            class="qty"
+                            maxlength="13"
+                            aria-required="true"
+                            data-validate='{
+                                "required-number-if-specified": "[data-id=<%- data.widgetId %><%- data.rowIndex %>sku]",
+                                "validate-number": true,
+                                "validate-greater-than-zero": true,
+                                "validate-number-range": "0.0001-99999999.9999"
+                            }'
+                            data-role="product-qty"
+                        >
                     </div>
                 </div>
                 <div class="actions-toolbar">
                     <div class="secondary">
-                        <button type="button" class="action remove" title="<?= $block->escapeHtml(__('Remove Row')) ?>" data-role="delete">
-                            <span><?= $block->escapeHtml(__('Remove Row')) ?></span>
+                        <button
+                            type="button"
+                            class="action remove"
+                            title="<?= __('Remove Row') ?>"
+                            data-role="delete"
+                        >
+                            <?= __('Remove Row') ?>
                         </button>
                     </div>
                 </div>

From d7d1d30ae564f98024caefe50f018cca0aa18515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 11:08:57 +0100
Subject: [PATCH 34/69] #49456 - Update content in quickorder sku's template

---
 Magento_QuickOrder/templates/widget/sku.phtml | 188 ++++++++----------
 1 file changed, 80 insertions(+), 108 deletions(-)

diff --git a/Magento_QuickOrder/templates/widget/sku.phtml b/Magento_QuickOrder/templates/widget/sku.phtml
index 12b06bebe..e15816f7c 100644
--- a/Magento_QuickOrder/templates/widget/sku.phtml
+++ b/Magento_QuickOrder/templates/widget/sku.phtml
@@ -7,23 +7,21 @@
 ?>
 <div
     id="<?= $block->getUniqueId() ?>"
-    class="widget block block-addbysku"
     data-role="block-addbysku"
     data-mage-init='{
-        "quickOrderItemTable":{
-            "addBlockData":{"widgetId":"<?= $block->getUniqueId() ?>"},
-            "addEvent":"addNewRow",
-            "addSelector":"[data-role=new-block]"
+        "quickOrderItemTable": {
+            "addBlockData": {"widgetId":"<?= $block->getUniqueId() ?>"},
+            "addEvent": "addNewRow",
+            "addSelector": "[data-role=new-block]"
         }
     }'
 >
     <div
         data-role="show-errors"
-        class="wrap-sum-errors"
         data-mage-init='{
-            "countingErrors":{
-                    "wrapError":"[data-role=block-addbysku]",
-                    "nameErrorBlock":"[data-role=error-message]"
+            "countingErrors": {
+                "wrapError": "[data-role=block-addbysku]",
+                "nameErrorBlock": "[data-role=error-message]"
             }
         }'
     ></div>
@@ -34,130 +32,104 @@
             </strong>
         </div>
     <?php endif ?>
-    <div class="block-content">
+    <div class="quickorder">
         <form
-            class="form form-addbysku"
             action="<?= $block->getUrl('quickorder/sku/uploadfile') ?>"
             method="post"
             data-role="send-sku"
-            data-mage-init='{"validation":{}, "quickOrderAddToCart":{}}'
+            data-mage-init='{"validation": {}, "quickOrderAddToCart": {}}'
             <?php if ($block->getIsMultipart()): ?> enctype="multipart/form-data"<?php endif; ?>
         >
-            <div class="box box-items">
-                <fieldset class="fieldset" data-container="items">
-                    <div class="fields additional deletable-item-title">
-                        <div class="field sku required">
-                            <label class="label">
-                                <?= __('Enter SKU or Product Name') ?>
-                            </label>
-                        </div>
-                        <div class="field qty required">
-                            <label class="label">
-                                <?= __('Qty') ?>
-                            </label>
-                        </div>
+            <ul class="list">
+                <fieldset class="fieldset" data-container="items"></fieldset>
+                <?php if ($block->getChildHtml()): ?>
+                    <div class="box box-upload">
+                        <fieldset class="fieldset">
+                            <?= $block->getChildHtml() ?>
+                        </fieldset>
                     </div>
-                </fieldset>
-            </div>
-            <?php if ($block->getChildHtml()): ?>
-                <div class="box box-upload">
-                    <fieldset class="fieldset">
-                        <?= $block->getChildHtml() ?>
-                    </fieldset>
-                </div>
-            <?php endif; ?>
-            <div class="actions-toolbar">
-                <div class="primary">
-                    <button
-                        type="submit"
-                        title="<?= __('Add to Cart') ?>"
-                        class="action tocart primary"
-                        data-action="submit-sku"
-                        disabled
-                    >
-                        <?= __('Add to Cart') ?>
-                    </button>
-                </div>
-            </div>
-            <?php if ($block->getLink()): ?>
-                <?= $block->getLink() ?>
-            <?php endif; ?>
+                <?php endif; ?>
+                <button
+                    type="submit"
+                    class="button tocart"
+                    data-action="submit-sku"
+                    disabled
+                >
+                    <?= __('Add to Cart') ?>
+                </button>
+                <?php if ($block->getLink()): ?>
+                    <?= $block->getLink() ?>
+                <?php endif; ?>
+            </ul>
         </form>
         <script data-template="add-block" type="text/x-magento-template">
-            <div
-                class="fields additional deletable-item"
+            <li
+                class="list__item quickorder__list-item deletable-item"
                 data-role="new-block"
                 data-mage-init='{
-                    "deletableItem":{},
-                    "productSkuItem":{
+                    "deletableItem": {},
+                    "productSkuItem": {
                         "rowIndex": "<%- data.rowIndex %>",
                         "tableWigetSelector":"[data-role=block-addbysku]",
                         "urlSku":"<?= $block->getUrl('quickorder/ajax/search') ?>"
                     }
                 }'
             >
-                <div class="field sku required ui-front">
-                    <label class="label">
+                <div class="input required">
+                    <label class="label" for="id-items<%- data.widgetId %><%- data.rowIndex %>sku">
                         <?= __('Enter SKU or Product Name') ?>
                     </label>
-                    <div class="control">
-                        <input
-                            type="text"
-                            name="items[<%- data.rowIndex %>][sku]"
-                            id="id-items<%- data.widgetId %><%- data.rowIndex %>sku"
-                            data-id="<%- data.widgetId %><%- data.rowIndex %>sku"
-                            data-sku="true"
-                            aria-required="true"
-                            data-mage-init='{
-                                "Magento_QuickOrder/js/sku/autocomplete": {
-                                    "sourceUrl": "<?= $block->getUrl('quickorder/ajax/product_suggest') ?>"
-                                }
-                            }'
-                            data-validate='{
-                                "required-if-all-sku-empty-and-file-not-loaded": {
-                                    specifiedId: "#customer_sku_csv",
-                                    dataSku: "data-sku"
-                                }
-                            }'
-                            data-role="product-sku"
-                        >
-                    </div>
+                    <input
+                        class="input__field"
+                        type="text"
+                        name="items[<%- data.rowIndex %>][sku]"
+                        id="id-items<%- data.widgetId %><%- data.rowIndex %>sku"
+                        data-id="<%- data.widgetId %><%- data.rowIndex %>sku"
+                        data-sku="true"
+                        aria-required="true"
+                        data-mage-init='{
+                            "Magento_QuickOrder/js/sku/autocomplete": {
+                                "sourceUrl": "<?= $block->getUrl('quickorder/ajax/product_suggest') ?>"
+                            }
+                        }'
+                        data-validate='{
+                            "required-if-all-sku-empty-and-file-not-loaded": {
+                                specifiedId: "#customer_sku_csv",
+                                dataSku: "data-sku"
+                            }
+                        }'
+                        data-role="product-sku"
+                    >
                     <div class="product-block" data-role="product-block"></div>
                 </div>
-                <div class="field qty required">
+                <div class="input required">
                     <label class="label">
                         <?= __('Qty') ?>
                     </label>
-                    <div class="control">
-                        <input
-                            type="number"
-                            name="items[<%- data.rowIndex %>][qty]"
-                            id="id-items<%- data.widgetId %><%- data.rowIndex %>qty"
-                            class="qty"
-                            maxlength="13"
-                            aria-required="true"
-                            data-validate='{
-                                "required-number-if-specified": "[data-id=<%- data.widgetId %><%- data.rowIndex %>sku]",
-                                "validate-number": true,
-                                "validate-greater-than-zero": true,
-                                "validate-number-range": "0.0001-99999999.9999"
-                            }'
-                            data-role="product-qty"
-                        >
-                    </div>
-                </div>
-                <div class="actions-toolbar">
-                    <div class="secondary">
-                        <button
-                            type="button"
-                            class="action remove"
-                            title="<?= __('Remove Row') ?>"
-                            data-role="delete"
-                        >
-                            <?= __('Remove Row') ?>
-                        </button>
-                    </div>
+                    <input
+                        type="number"
+                        name="items[<%- data.rowIndex %>][qty]"
+                        id="id-items<%- data.widgetId %><%- data.rowIndex %>qty"
+                        class="input__field quickorder__qty-field"
+                        min="0"
+                        maxlength="13"
+                        aria-required="true"
+                        data-validate='{
+                            "required-number-if-specified": "[data-id=<%- data.widgetId %><%- data.rowIndex %>sku]",
+                            "validate-number": true,
+                            "validate-greater-than-zero": true,
+                            "validate-number-range": "0.0001-99999999.9999"
+                        }'
+                        data-role="product-qty"
+                    >
                 </div>
+                <button
+                    type="button"
+                    class="button button--secondary"
+                    data-role="delete"
+                >
+                    <?= __('Remove Row') ?>
+                </button>
             </div>
         </script>
     </div>

From ad624ba09633aa0fb55b3c1a03643536d58cb01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 11:11:22 +0100
Subject: [PATCH 35/69] #49456 - Copy multiple sku template

---
 .../templates/multipleskus.phtml              | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 Magento_QuickOrder/templates/multipleskus.phtml

diff --git a/Magento_QuickOrder/templates/multipleskus.phtml b/Magento_QuickOrder/templates/multipleskus.phtml
new file mode 100644
index 000000000..cd89f7b70
--- /dev/null
+++ b/Magento_QuickOrder/templates/multipleskus.phtml
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @var $block \Magento\Framework\View\Element\Template
+ */
+?>
+<div class="fields additional">
+    <div class="field sku">
+        <label for="multiple_skus" class="label">
+            <span><?= $block->escapeHtml(__('Enter Multiple SKUs')) ?></span>
+        </label>
+        <div class="control">
+            <textarea
+                name="multiple_skus"
+                data-role="multiple-skus"
+                id="multiple_skus"
+                data-id="multiple_skus"
+                aria-required="false"
+                rows="2"
+                class="input-text"
+                ></textarea>
+        </div>
+        <div class="note">
+            <p><?= $block->escapeHtml(__('Use commas or paragraph to separate SKUs.')) ?></p>
+        </div>
+    </div>
+</div>
+<div class="actions-toolbar">
+    <div class="secondary">
+        <button type="button"
+                title="<?= $block->escapeHtml(__('Add to List')) ?>"
+                class="action move-to-single-skus"
+                data-mage-init='{"quickOrderMultipleSkus":{
+                "urlSku":"<?= /* @noEscape */ $block->getUrl('quickorder/ajax/search') ?>"
+                }}'>
+            <span><?= $block->escapeHtml(__('Add to List')) ?></span>
+        </button>
+    </div>
+</div>

From 554ac659d862c11ab750fedbb9fe85340c82a7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 11:22:19 +0100
Subject: [PATCH 36/69] #48974 - Edit multipleskus template

---
 .../templates/multipleskus.phtml              | 59 +++++++++----------
 Magento_QuickOrder/templates/widget/sku.phtml |  8 +--
 2 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/Magento_QuickOrder/templates/multipleskus.phtml b/Magento_QuickOrder/templates/multipleskus.phtml
index cd89f7b70..daf7fdda7 100644
--- a/Magento_QuickOrder/templates/multipleskus.phtml
+++ b/Magento_QuickOrder/templates/multipleskus.phtml
@@ -3,36 +3,33 @@
  * @var $block \Magento\Framework\View\Element\Template
  */
 ?>
-<div class="fields additional">
-    <div class="field sku">
-        <label for="multiple_skus" class="label">
-            <span><?= $block->escapeHtml(__('Enter Multiple SKUs')) ?></span>
+<li class="list__item quickorder__list-item">
+    <div class="input quickorder__textarea">
+        <label for="multiple_skus" class="input__label">
+            <?= __('Enter Multiple SKUs') ?>
         </label>
-        <div class="control">
-            <textarea
-                name="multiple_skus"
-                data-role="multiple-skus"
-                id="multiple_skus"
-                data-id="multiple_skus"
-                aria-required="false"
-                rows="2"
-                class="input-text"
-                ></textarea>
-        </div>
-        <div class="note">
-            <p><?= $block->escapeHtml(__('Use commas or paragraph to separate SKUs.')) ?></p>
-        </div>
+        <textarea
+            name="multiple_skus"
+            data-role="multiple-skus"
+            id="multiple_skus"
+            data-id="multiple_skus"
+            aria-required="false"
+            rows="2"
+            class="input__field input__field--textarea"
+        ></textarea>
     </div>
-</div>
-<div class="actions-toolbar">
-    <div class="secondary">
-        <button type="button"
-                title="<?= $block->escapeHtml(__('Add to List')) ?>"
-                class="action move-to-single-skus"
-                data-mage-init='{"quickOrderMultipleSkus":{
-                "urlSku":"<?= /* @noEscape */ $block->getUrl('quickorder/ajax/search') ?>"
-                }}'>
-            <span><?= $block->escapeHtml(__('Add to List')) ?></span>
-        </button>
-    </div>
-</div>
+    <p>
+        <?= __('Use commas or paragraph to separate SKUs.') ?>
+    </p>
+    <button
+        type="button"
+        class="button button--secondary"
+        data-mage-init='{
+            "quickOrderMultipleSkus": {
+                "urlSku":"<?= $block->getUrl('quickorder/ajax/search') ?>"
+            }
+        }'
+    >
+        <?= __('Add to List') ?>
+    </button>
+</li>
diff --git a/Magento_QuickOrder/templates/widget/sku.phtml b/Magento_QuickOrder/templates/widget/sku.phtml
index e15816f7c..2c1ed781e 100644
--- a/Magento_QuickOrder/templates/widget/sku.phtml
+++ b/Magento_QuickOrder/templates/widget/sku.phtml
@@ -41,13 +41,9 @@
             <?php if ($block->getIsMultipart()): ?> enctype="multipart/form-data"<?php endif; ?>
         >
             <ul class="list">
-                <fieldset class="fieldset" data-container="items"></fieldset>
+                <div data-container="items"></div>
                 <?php if ($block->getChildHtml()): ?>
-                    <div class="box box-upload">
-                        <fieldset class="fieldset">
-                            <?= $block->getChildHtml() ?>
-                        </fieldset>
-                    </div>
+                    <?= $block->getChildHtml() ?>
                 <?php endif; ?>
                 <button
                     type="submit"

From 785a0abfb3cecb14d9f7530a293344e6610df73d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 11:24:38 +0100
Subject: [PATCH 37/69] #48974 - Add for attribute to qty label

---
 Magento_QuickOrder/templates/widget/sku.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Magento_QuickOrder/templates/widget/sku.phtml b/Magento_QuickOrder/templates/widget/sku.phtml
index 2c1ed781e..0e540e327 100644
--- a/Magento_QuickOrder/templates/widget/sku.phtml
+++ b/Magento_QuickOrder/templates/widget/sku.phtml
@@ -99,7 +99,10 @@
                     <div class="product-block" data-role="product-block"></div>
                 </div>
                 <div class="input required">
-                    <label class="label">
+                    <label
+                        class="label"
+                        for="id-items<%- data.widgetId %><%- data.rowIndex %>qty"
+                    >
                         <?= __('Qty') ?>
                     </label>
                     <input

From 3a8764027b6ccb0c087a6f761e14aaed84c5347d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 11:26:31 +0100
Subject: [PATCH 38/69] #48974 - Copy quickorder file upload template

---
 .../advancedcheckout/customer/file.phtml      | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml

diff --git a/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml b/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml
new file mode 100644
index 000000000..9f2baf97d
--- /dev/null
+++ b/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml
@@ -0,0 +1,42 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+// @codingStandardsIgnoreFile
+?>
+<?php
+/**
+ * @var $block \Magento\Framework\View\Element\Template
+ */
+$fieldNameFile = \Magento\AdvancedCheckout\Model\Import::FIELD_NAME_SOURCE_FILE;
+$fieldImportedFlagFile = \Magento\AdvancedCheckout\Helper\Data::REQUEST_PARAMETER_SKU_FILE_IMPORTED_FLAG;
+$extErrorText = __(
+    'The file could not be uploaded because it is in the wrong format. Please select a CSV file to upload.'
+);
+?>
+<div class="field upload skus">
+    <label class="label" for="customer_sku_csv">
+        <span><?= $block->escapeHtml(__('Add from File')) ?></span>
+    </label>
+    <div class="control" data-mage-init='{"fieldsetControls": {}, "fileChooser": {
+            "fileNameSelector": "[name=<?= $block->escapeHtml($fieldNameFile) ?>]",
+            "fileNameIndicatorSelector": "[name=<?= $block->escapeHtml($fieldImportedFlagFile) ?>]"
+            },
+            "quickOrderFile":{
+            "fileNameSelector": "[name=<?= $block->escapeHtml($fieldNameFile) ?>]",
+            "extErrorText": "<?= $block->escapeHtml($extErrorText) ?>",
+            "urlSku":"<?= $block->escapeHtml($block->getUrl('quickorder/ajax/search')) ?>"
+            }}'>
+        <div class="note">
+            <p><?= /* @noEscape */ $block->escapeHtml(__('File must be in .csv format and include "SKU" and "QTY" columns')); ?>
+               <?= /* @noEscape */ $block->getChildHtml('quick_order_download_template_link') ?></p>
+        </div>
+        <div class="upload-container">
+            <div class="file-upload"><?= $block->escapeHtml(__('Choose File')) ?></div>
+            <input id="customer_sku_csv" type="file" data-reset="true" class="action-upload"
+                name="<?= $block->escapeHtml($fieldNameFile) ?>"
+                >
+        </div>
+    </div>
+</div>

From 73d3187ccd1d57fe37f030d0bf3315a8ca119441 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 11:39:23 +0100
Subject: [PATCH 39/69] #48974 - Update structure in  file template

---
 .../advancedcheckout/customer/file.phtml      | 56 ++++++++++---------
 1 file changed, 30 insertions(+), 26 deletions(-)

diff --git a/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml b/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml
index 9f2baf97d..fb1421bfa 100644
--- a/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml
+++ b/Magento_QuickOrder/templates/advancedcheckout/customer/file.phtml
@@ -1,11 +1,4 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
-// @codingStandardsIgnoreFile
-?>
-<?php
 /**
  * @var $block \Magento\Framework\View\Element\Template
  */
@@ -15,28 +8,39 @@ $extErrorText = __(
     'The file could not be uploaded because it is in the wrong format. Please select a CSV file to upload.'
 );
 ?>
-<div class="field upload skus">
-    <label class="label" for="customer_sku_csv">
-        <span><?= $block->escapeHtml(__('Add from File')) ?></span>
-    </label>
-    <div class="control" data-mage-init='{"fieldsetControls": {}, "fileChooser": {
-            "fileNameSelector": "[name=<?= $block->escapeHtml($fieldNameFile) ?>]",
-            "fileNameIndicatorSelector": "[name=<?= $block->escapeHtml($fieldImportedFlagFile) ?>]"
+<li class="list__item quickorder__list-item">
+    <p>
+        <?= __('Add from File') ?>
+    </p>
+    <div
+        class="control"
+        data-mage-init='{
+            "fieldsetControls": {},
+            "fileChooser": {
+                "fileNameSelector": "[name=<?= $block->escapeHtml($fieldNameFile) ?>]",
+                "fileNameIndicatorSelector": "[name=<?= $block->escapeHtml($fieldImportedFlagFile) ?>]"
             },
             "quickOrderFile":{
-            "fileNameSelector": "[name=<?= $block->escapeHtml($fieldNameFile) ?>]",
-            "extErrorText": "<?= $block->escapeHtml($extErrorText) ?>",
-            "urlSku":"<?= $block->escapeHtml($block->getUrl('quickorder/ajax/search')) ?>"
-            }}'>
-        <div class="note">
-            <p><?= /* @noEscape */ $block->escapeHtml(__('File must be in .csv format and include "SKU" and "QTY" columns')); ?>
-               <?= /* @noEscape */ $block->getChildHtml('quick_order_download_template_link') ?></p>
-        </div>
+                "fileNameSelector": "[name=<?= $block->escapeHtml($fieldNameFile) ?>]",
+                "extErrorText": "<?= $block->escapeHtml($extErrorText) ?>",
+                "urlSku":"<?= $block->escapeHtml($block->getUrl('quickorder/ajax/search')) ?>"
+            }
+        }'>
+        <p>
+            <?= __('File must be in .csv format and include "SKU" and "QTY" columns'); ?>
+            <?= $block->getChildHtml('quick_order_download_template_link') ?>
+        </p>
         <div class="upload-container">
-            <div class="file-upload"><?= $block->escapeHtml(__('Choose File')) ?></div>
-            <input id="customer_sku_csv" type="file" data-reset="true" class="action-upload"
+            <label for="customer_sku_csv">
+                <?= __('Choose File') ?>
+            </label>
+            <input
+                id="customer_sku_csv"
+                type="file"
+                data-reset="true"
+                accept=".csv"
                 name="<?= $block->escapeHtml($fieldNameFile) ?>"
-                >
+            >
         </div>
     </div>
-</div>
+</li>

From 3c66bcf201ea5278cc74ea8047029ef5e9c23960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 14:11:32 +0100
Subject: [PATCH 40/69] #48974 - Add product info and autocomplete templates

---
 Magento_QuickOrder/templates/widget/sku.phtml    |  2 +-
 .../web/templates/dropdown-item.html             |  5 +++++
 .../web/templates/product-info.html              | 16 ++++++++++++++++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 Magento_QuickOrder/web/templates/dropdown-item.html
 create mode 100644 Magento_QuickOrder/web/templates/product-info.html

diff --git a/Magento_QuickOrder/templates/widget/sku.phtml b/Magento_QuickOrder/templates/widget/sku.phtml
index 0e540e327..70dc1243b 100644
--- a/Magento_QuickOrder/templates/widget/sku.phtml
+++ b/Magento_QuickOrder/templates/widget/sku.phtml
@@ -96,8 +96,8 @@
                         }'
                         data-role="product-sku"
                     >
-                    <div class="product-block" data-role="product-block"></div>
                 </div>
+                <div data-role="product-block"></div>
                 <div class="input required">
                     <label
                         class="label"
diff --git a/Magento_QuickOrder/web/templates/dropdown-item.html b/Magento_QuickOrder/web/templates/dropdown-item.html
new file mode 100644
index 000000000..765622c56
--- /dev/null
+++ b/Magento_QuickOrder/web/templates/dropdown-item.html
@@ -0,0 +1,5 @@
+<li class="quickorder__autocomplete-item">
+    <a><%- data.labelSku %></a>
+    <span>-</span>
+    <span><%- data.labelProductName %></span>
+</li>
diff --git a/Magento_QuickOrder/web/templates/product-info.html b/Magento_QuickOrder/web/templates/product-info.html
new file mode 100644
index 000000000..81324f6ad
--- /dev/null
+++ b/Magento_QuickOrder/web/templates/product-info.html
@@ -0,0 +1,16 @@
+<% if (data.name) { %>
+    <div class="quickorder__product">
+        <img class="quickorder__product-image" src="<%- data.thumbnailUrl %>">
+        <div class="quickorder__product-details">
+            <a class="link" href="<%- data.url %>"><%- data.name %></a>
+            <div class="price">
+                <span class="price__value"><%- data.price %></span>
+            </div>
+        </div>
+    </div>
+<% } %>
+<% if (data.result) { %>
+    <div <% if (data.isError) { %>data-role="error-message"<% } %> class="message<% if (data.isError) { %> error<% } else { %> notice<% } %>">
+        <div><%- data.result %></div>
+    </div>
+<% } %>

From a4017a9e7a9b1688b142e2bc8c48e6bac91b979a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 14:16:31 +0100
Subject: [PATCH 41/69] #48974 - Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 005c4cdea..fcc5cf498 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 ## [Unreleased]
 ### Added
 - Support for escape key in dropdown script
+- Quickorder page styles
 
 ### Changed
 - Refactor filters and accessibility improvements

From ab0bfdb60d48980a23400fc04411ab50b4c512d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 25 Jan 2019 15:41:48 +0100
Subject: [PATCH 42/69] #49492 - Fix login form for disabled guest checkout

---
 CHANGELOG.md                                            | 1 +
 Magento_Customer/web/template/authentication-popup.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 005c4cdea..e31e0ce03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ All notable changes to this project will be documented in this file.
 ### Fixed
 - Duplicated `email` id on company users view
 - Duplicated `My wishlist` section in sidebar
+- Login form for disabled 'Guest Checkout'
 
 ## [1.1.0] - 2019-01-07
 ### Added
diff --git a/Magento_Customer/web/template/authentication-popup.html b/Magento_Customer/web/template/authentication-popup.html
index 50058e2c9..6547e56bb 100644
--- a/Magento_Customer/web/template/authentication-popup.html
+++ b/Magento_Customer/web/template/authentication-popup.html
@@ -62,7 +62,7 @@
                 id="login-form"
                 class="form form-login"
                 method="post"
-                data-bind="submit:login"
+                data-bind="event: {submit: login }"
             >
                 <div
                     class="fieldset login"

From 33b4f1892e27309f6c1d3ed691742633676fe504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 29 Jan 2019 09:20:57 +0100
Subject: [PATCH 43/69] #48974 - Formatting

---
 Magento_QuickOrder/web/templates/product-info.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Magento_QuickOrder/web/templates/product-info.html b/Magento_QuickOrder/web/templates/product-info.html
index 81324f6ad..f42653f42 100644
--- a/Magento_QuickOrder/web/templates/product-info.html
+++ b/Magento_QuickOrder/web/templates/product-info.html
@@ -10,7 +10,10 @@
     </div>
 <% } %>
 <% if (data.result) { %>
-    <div <% if (data.isError) { %>data-role="error-message"<% } %> class="message<% if (data.isError) { %> error<% } else { %> notice<% } %>">
+    <div
+        <% if (data.isError) { %>data-role="error-message"<% } %>
+        class="message<% if (data.isError) { %> error<% } else { %> notice<% } %>"
+    >
         <div><%- data.result %></div>
     </div>
 <% } %>

From 68ea802e648bdda9be10ce59e46cff15d79fc961 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 5 Feb 2019 16:17:11 +0100
Subject: [PATCH 44/69] #49721 - Change hidden swatch input class

---
 Magento_Swatches/web/js/swatch-renderer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento_Swatches/web/js/swatch-renderer.js b/Magento_Swatches/web/js/swatch-renderer.js
index 0541a7e72..f4e7fa7e2 100644
--- a/Magento_Swatches/web/js/swatch-renderer.js
+++ b/Magento_Swatches/web/js/swatch-renderer.js
@@ -193,7 +193,7 @@ define([
               attributeLabelClass: 'swatch__title product-view__swatch-option-title',
               attributeSelectedOptionLabelClass: 'swatch__selected-option',
               attributeOptionsWrapper: 'swatch__wrapper',
-              attributeInput: 'swatch-input',
+              attributeInput: 'swatch__input',
               optionClass: 'swatch__option',
               optionContainerClass: 'swatch__option-container',
               selectClass: 'swatch-select',

From cc390e2aa5bfa9a166e5674c9733f873698ab7b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 6 Feb 2019 16:31:14 +0100
Subject: [PATCH 45/69] #49721 - Remove swatch renderer file

---
 .../templates/product/view/renderer.phtml     | 23 -------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 Magento_Swatches/templates/product/view/renderer.phtml

diff --git a/Magento_Swatches/templates/product/view/renderer.phtml b/Magento_Swatches/templates/product/view/renderer.phtml
deleted file mode 100644
index f954470af..000000000
--- a/Magento_Swatches/templates/product/view/renderer.phtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-// @codingStandardsIgnoreFile
-//"swatchRenderer": {
-?>
-<?php /** @var $block \Magento\Swatches\Block\Product\Renderer\Configurable */ ?>
-<div class="swatch-opt" data-role="swatch-options"></div>
-
-<script type="text/x-magento-init">
-    {
-        "[data-role=swatch-options]": {
-            "Magento_Swatches/js/swatch-renderer": {
-                "jsonConfig": <?= $swatchOptions = $block->getJsonConfig() ?>,
-                "jsonSwatchConfig": <?php echo $block->getJsonSwatchConfig(); ?>,
-                "mediaCallback": "<?= $block->getMediaCallback() ?>",
-                "gallerySwitchStrategy": "<?= $block->getVar('gallery_switch_strategy',
-                    'Magento_ConfigurableProduct') ?: 'replace'; ?>"
-            },
-            "Magento_Swatches/js/configurable-customer-data": {
-                "swatchOptions": <?php echo $swatchOptions ?>
-            }
-        }
-    }
-</script>

From 641eca8b3f696f74abbcd32a14208a32c724e3a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 6 Feb 2019 17:19:54 +0100
Subject: [PATCH 46/69] #49721 - Update swatch-renderer script to 2.3

---
 Magento_Swatches/web/js/swatch-renderer.js | 101 +++++++++------------
 1 file changed, 43 insertions(+), 58 deletions(-)

diff --git a/Magento_Swatches/web/js/swatch-renderer.js b/Magento_Swatches/web/js/swatch-renderer.js
index f4e7fa7e2..e00001482 100644
--- a/Magento_Swatches/web/js/swatch-renderer.js
+++ b/Magento_Swatches/web/js/swatch-renderer.js
@@ -62,6 +62,8 @@ define([
    *  - option-label (string)
    *  - option-tooltip-thumb
    *  - option-tooltip-value
+   *  - thumb - width
+   *  - thumb - height
    */
   $.widget('mage.SwatchRendererTooltip', {
       options: {
@@ -81,11 +83,13 @@ define([
               label = $this.attr('option-label'),
               thumb = $this.attr('option-tooltip-thumb'),
               value = $this.attr('option-tooltip-value'),
+              width = $this.attr('thumb-width'),
+              height = $this.attr('thumb-height'),
               $image,
               $title,
               $corner;
 
-          if (!$element.size()) {
+          if (!$element.length) {
               $element = $('<div class="' +
                   $widget.options.tooltipClass +
                   '"><div class="image"></div><div class="title"></div><div class="corner"></div></div>'
@@ -110,7 +114,9 @@ define([
                               // Image
                               $image.css({
                                   'background': 'url("' + thumb + '") no-repeat center', //Background case
-                                  'background-size': 'initial'
+                                  'background-size': 'initial',
+                                  'width': width + 'px',
+                                  'height': height + 'px'
                               });
                               $image.show();
                           } else if (type === 1) {
@@ -231,7 +237,7 @@ define([
           controlLabelId: '',
 
           // text for more button
-          moreButtonText: 'More',
+          moreButtonText: $t('More'),
 
           // Callback url for media
           mediaCallback: '',
@@ -615,10 +621,6 @@ define([
               return $widget._OnClick($(this), $widget);
           });
 
-          $widget.element.on('emulateClick', '.' + options.optionContainerClass, function () {
-              return $widget._OnClick($(this), $widget, 'emulateClick');
-          });
-
           $widget.element.on('change', '.' + options.selectClass, function () {
               return $widget._OnChange($(this), $widget);
           });
@@ -649,10 +651,9 @@ define([
       /**
        * Load media gallery using ajax or json config.
        *
-       * @param {String|undefined} eventName
        * @private
        */
-      _loadMedia: function (eventName) {
+      _loadMedia: function () {
           var $main = this.inProductList ?
                   this.element.parents('.product-item-info') :
                   this.element.parents('.column.main'),
@@ -667,7 +668,7 @@ define([
                   images = this.options.mediaGalleryInitial;
               }
 
-              this.updateBaseImage(images, $main, !this.inProductList, eventName);
+              this.updateBaseImage(images, $main, !this.inProductList);
           }
       },
 
@@ -676,10 +677,9 @@ define([
        *
        * @param {Object} $this
        * @param {Object} $widget
-       * @param {String|undefined} eventName
        * @private
        */
-      _OnClick: function ($this, $widget, eventName) {
+      _OnClick: function ($this, $widget) {
           var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
               $wrapper = $this.parents('.' + $widget.options.classes.attributeOptionsWrapper),
               $label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
@@ -718,7 +718,7 @@ define([
               $widget._UpdatePrice();
           }
 
-          $widget._loadMedia(eventName);
+          $widget._loadMedia();
           $input.trigger('change');
       },
 
@@ -815,7 +815,7 @@ define([
           $widget._Rewind(controls);
 
           // done if nothing selected
-          if (selected.size() <= 0) {
+          if (selected.length <= 0) {
               return;
           }
 
@@ -825,7 +825,7 @@ define([
                   id = $this.attr('attribute-id'),
                   products = $widget._CalcProducts(id);
 
-              if (selected.size() === 1 && selected.first().attr('attribute-id') === id) {
+              if (selected.length === 1 && selected.first().attr('attribute-id') === id) {
                   return;
               }
 
@@ -1037,7 +1037,7 @@ define([
       _EnableProductMediaLoader: function ($this) {
           var $widget = this;
 
-          if ($('body.catalog-product-view').size() > 0) {
+          if ($('body.catalog-product-view').length > 0) {
               $this.parents('.column.main').find('.photo.image')
                   .addClass($widget.options.classes.loader);
           } else {
@@ -1057,7 +1057,7 @@ define([
       _DisableProductMediaLoader: function ($this) {
           var $widget = this;
 
-          if ($('body.catalog-product-view').size() > 0) {
+          if ($('body.catalog-product-view').length > 0) {
               $this.parents('.column.main').find('.photo.image')
                   .removeClass($widget.options.classes.loader);
           } else {
@@ -1138,36 +1138,16 @@ define([
           return images;
       },
 
-      /**
-       * Start update base image process based on event name
-       * @param {Array} images
-       * @param {jQuery} context
-       * @param {Boolean} isInProductView
-       * @param {String|undefined} eventName
-       */
-      updateBaseImage: function (images, context, isInProductView, eventName) {
-        var gallery = context.find(this.options.mediaGallerySelector).data('gallery');
-
-        if (eventName === undefined) {
-          this.processUpdateBaseImage(images, context, isInProductView, gallery);
-        } else {
-          context.find(this.options.mediaGallerySelector).on('gallery:loaded', function (loadedGallery) {
-            loadedGallery = context.find(this.options.mediaGallerySelector).data('gallery');
-            this.processUpdateBaseImage(images, context, isInProductView, loadedGallery);
-          }.bind(this));
-        }
-      },
-
       /**
        * Update [gallery-placeholder] or [product-image-photo]
        * @param {Array} images
        * @param {jQuery} context
        * @param {Boolean} isInProductView
-       * @param {Object} gallery
        */
-      processUpdateBaseImage: function (images, context, isInProductView, gallery) {
+      updateBaseImage: function (images, context, isInProductView) {
           var justAnImage = images[0],
               initialImages = this.options.mediaGalleryInitial,
+              gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
               imagesToUpdate,
               isInitial;
 
@@ -1236,27 +1216,10 @@ define([
        */
       _EmulateSelected: function (selectedAttributes) {
           $.each(selectedAttributes, $.proxy(function (attributeCode, optionId) {
-              this.element.find('.' + this.options.classes.attributeClass +
-                  '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]').trigger('click');
-          }, this));
-      },
-
-      /**
-       * Emulate mouse click or selection change on all swatches that should be selected
-       * @param {Object} [selectedAttributes]
-       * @param {String} triggerClick
-       * @private
-       */
-      _EmulateSelectedByAttributeId: function (selectedAttributes, triggerClick) {
-          $.each(selectedAttributes, $.proxy(function (attributeId, optionId) {
               var elem = this.element.find('.' + this.options.classes.attributeClass +
-                  '[attribute-id="' + attributeId + '"] [option-id="' + optionId + '"]'),
+                  '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]'),
                   parentInput = elem.parent();
 
-              if (triggerClick === null || triggerClick === '') {
-                triggerClick = 'click';
-              }
-
               if (elem.hasClass('selected')) {
                   return;
               }
@@ -1265,11 +1228,33 @@ define([
                   parentInput.val(optionId);
                   parentInput.trigger('change');
               } else {
-                  elem.trigger(triggerClick);
+                  elem.trigger('click');
               }
           }, this));
       },
 
+      /**
+        * Emulate mouse click or selection change on all swatches that should be selected
+        * @param {Object} [selectedAttributes]
+        * @private
+        */
+      _EmulateSelectedByAttributeId: function (selectedAttributes) {
+        $.each(selectedAttributes, $.proxy(function (attributeId, optionId) {
+          var elem = this.element.find('.' + this.options.classes.attributeClass +
+              '[attribute-id="' + attributeId + '"] [option-id="' + optionId + '"]'),
+          parentInput = elem.parent();
+          if (elem.hasClass('selected')) {
+            return;
+          }
+          if (parentInput.hasClass(this.options.classes.selectClass)) {
+            parentInput.val(optionId);
+            parentInput.trigger('change');
+          } else {
+            elem.trigger('click');
+          }
+        }, this));
+      },
+
       /**
        * Get default options values settings with either URL query parameters
        * @private

From 96e698ba61eeb5a9bc5980732df916eefcd811f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 7 Feb 2019 13:18:33 +0100
Subject: [PATCH 47/69] #49721 - Replace swatch-renderer script with mixin

---
 Magento_Swatches/requirejs-config.js          |    9 +
 .../web/js/swatch-renderer-mixin.js           |  324 ++++
 Magento_Swatches/web/js/swatch-renderer.js    | 1310 -----------------
 3 files changed, 333 insertions(+), 1310 deletions(-)
 create mode 100644 Magento_Swatches/requirejs-config.js
 create mode 100644 Magento_Swatches/web/js/swatch-renderer-mixin.js
 delete mode 100644 Magento_Swatches/web/js/swatch-renderer.js

diff --git a/Magento_Swatches/requirejs-config.js b/Magento_Swatches/requirejs-config.js
new file mode 100644
index 000000000..5c87302ad
--- /dev/null
+++ b/Magento_Swatches/requirejs-config.js
@@ -0,0 +1,9 @@
+var config = {
+  config: {
+    mixins: {
+      "Magento_Swatches/js/swatch-renderer": {
+        "Magento_Swatches/js/swatch-renderer-mixin": true
+      }
+    }
+  }
+};
diff --git a/Magento_Swatches/web/js/swatch-renderer-mixin.js b/Magento_Swatches/web/js/swatch-renderer-mixin.js
new file mode 100644
index 000000000..c98e87d2c
--- /dev/null
+++ b/Magento_Swatches/web/js/swatch-renderer-mixin.js
@@ -0,0 +1,324 @@
+define([
+  'jquery',
+  'underscore',
+  'mage/template',
+  'mage/translate',
+  'priceUtils',
+], function ($, _, mageTemplate, $t, priceUtils) {
+  'use strict';
+
+  return function (widget) {
+    $.widget('mage.SwatchRenderer', widget, {
+      options: {
+        classes: {
+          attributeClass: 'swatch',
+          attributeLabelClass: 'swatch__title product-view__swatch-option-title',
+          attributeSelectedOptionLabelClass: 'swatch__selected-option',
+          attributeOptionsWrapper: 'swatch__wrapper',
+          attributeInput: 'swatch__input',
+          optionClass: 'swatch__option',
+          optionContainerClass: 'swatch__option-container',
+          selectClass: 'swatch-select',
+          moreButton: 'swatch-more',
+          loader: 'swatch-option-loading'
+        },
+        // option's json config
+        jsonConfig: {},
+        // swatch's json config
+        jsonSwatchConfig: {},
+        // selector of parental block of prices and swatches (need to know where to seek for price block)
+        selectorProduct: '.product-info-main',
+        // selector of price wrapper (need to know where set price)
+        selectorProductPrice: '[data-role=priceBox]',
+        //selector of product images gallery wrapper
+        mediaGallerySelector: '[data-gallery-role=gallery-placeholder]',
+        // selector of category product tile wrapper
+        selectorProductTile: '.product-item',
+        // number of controls to show (false or zero = show all)
+        numberToShow: false,
+        // show only swatch controls
+        onlySwatches: false,
+        // enable label for control
+        enableControlLabel: true,
+        // control label id
+        controlLabelId: '',
+        // text for more button
+        moreButtonText: $t('More'),
+        // Callback url for media
+        mediaCallback: '',
+        // Local media cache
+        mediaCache: {},
+        // Cache for BaseProduct images. Needed when option unset
+        mediaGalleryInitial: [{}],
+        // Use ajax to get image data
+        useAjax: false,
+        /**
+         * Defines the mechanism of how images of a gallery should be
+         * updated when user switches between configurations of a product.
+         *
+         * As for now value of this option can be either 'replace' or 'prepend'.
+         *
+         * @type {String}
+         */
+        gallerySwitchStrategy: 'replace',
+        // whether swatches are rendered in product list or on product page
+        inProductList: false,
+        // sly-old-price block selector
+        slyOldPriceSelector: '.sly-old-price',
+        // tier prise selectors start
+        tierPriceTemplateSelector: '#tier-prices-template',
+        tierPriceBlockSelector: '[data-role="tier-price-block"]',
+        tierPriceTemplate: '',
+        // tier prise selectors end
+        // A price label selector
+        normalPriceLabelSelector: '.normal-price .price-label'
+      },
+      _RenderSwatchOptions: function (config, controlId) {
+        var optionConfig = this.options.jsonSwatchConfig[config.id],
+          optionClass = this.options.classes.optionClass,
+          optionContainerClass = this.options.classes.optionContainerClass,
+          moreLimit = parseInt(this.options.numberToShow, 10),
+          moreClass = this.options.classes.moreButton,
+          moreText = this.options.moreButtonText,
+          countAttributes = 0,
+          html = '';
+
+        if (!this.options.jsonSwatchConfig.hasOwnProperty(config.id)) {
+          return '';
+        }
+
+        $.each(config.options, function () {
+          var id,
+            type,
+            value,
+            thumb,
+            label,
+            attr;
+
+          if (!optionConfig.hasOwnProperty(this.id)) {
+            return '';
+          }
+
+          // Add more button
+          if (moreLimit === countAttributes++) {
+            html += '<a href="#" class="' + moreClass + '">' + moreText + '</a>';
+          }
+
+          id = this.id;
+          type = parseInt(optionConfig[id].type, 10);
+          value = optionConfig[id].hasOwnProperty('value') ? optionConfig[id].value : '';
+          thumb = optionConfig[id].hasOwnProperty('thumb') ? optionConfig[id].thumb : '';
+          label = this.label ? this.label : '';
+          attr =
+            ' id="' + controlId + '-item-' + id + '"' +
+            ' aria-selected="false"' +
+            ' aria-describedby="' + controlId + '"' +
+            ' tabindex="0"' +
+            ' option-type="' + type + '"' +
+            ' option-id="' + id + '"' +
+            ' option-label="' + label + '"' +
+            ' aria-label="' + label + '"' +
+            ' option-tooltip-thumb="' + thumb + '"' +
+            ' option-tooltip-value="' + value + '"' +
+            ' role="option"';
+
+          if (!this.hasOwnProperty('products') || this.products.length <= 0) {
+            attr += ' option-empty="true"';
+          }
+
+          html += '<div class="' + optionContainerClass + '" ' + attr + '><div class="' + optionClass;
+          if (type === 0) {
+            // Text
+            html += '">' + (value ? value : label);
+          } else if (type === 1) {
+            // Color
+            if (value === '#ffffff') {
+              html += ' ' + optionClass + '--white';
+            }
+            html += '" style="background-color: ' + value + '">';
+          } else if (type === 2) {
+            // Image
+            html += ' ' + optionClass + '--image"' + ' style="background-image: url(' + value + ')">';
+          } else if (type === 3) {
+            // Clear
+            html += '">';
+          } else {
+            // Default
+            html += '">' + label;
+          }
+          html += '</div></div>'
+        });
+
+        return html;
+      },
+      _EventListener: function () {
+        var $widget = this,
+          options = this.options.classes,
+          target;
+
+        $widget.element.on('click', '.' + options.optionContainerClass, function () {
+          return $widget._OnClick($(this), $widget);
+        });
+
+        $widget.element.on('change', '.' + options.selectClass, function () {
+          return $widget._OnChange($(this), $widget);
+        });
+
+        $widget.element.on('click', '.' + options.moreButton, function (e) {
+          e.preventDefault();
+
+          return $widget._OnMoreClick($(this));
+        });
+
+        $widget.element.on('keydown', function (e) {
+          if (e.which === 13) {
+            target = $(e.target);
+
+            if (target.is('.' + options.optionContainerClass)) {
+              return $widget._OnClick(target, $widget);
+            } else if (target.is('.' + options.selectClass)) {
+              return $widget._OnChange(target, $widget);
+            } else if (target.is('.' + options.moreButton)) {
+              e.preventDefault();
+
+              return $widget._OnMoreClick(target);
+            }
+          }
+        });
+      },
+      _OnClick: function ($this, $widget) {
+        var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
+          $wrapper = $this.parents('.' + $widget.options.classes.attributeOptionsWrapper),
+          $label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
+          attributeId = $parent.attr('attribute-id'),
+          $input = $parent.find('.' + $widget.options.classes.attributeInput);
+
+        if ($widget.inProductList) {
+          $input = $widget.productForm.find(
+            '.' + $widget.options.classes.attributeInput + '[name="super_attribute[' + attributeId + ']"]'
+          );
+        }
+
+        if ($this.hasClass('disabled')) {
+          return;
+        }
+
+        if ($this.hasClass('selected')) {
+          $parent.removeAttr('option-selected').find('.selected').removeClass('selected');
+          $input.val('');
+          $label.text('');
+          $this.attr('aria-selected', false);
+        } else {
+          $parent.attr('option-selected', $this.attr('option-id')).find('.selected').removeClass('selected');
+          $label.text($this.attr('option-label'));
+          $input.val($this.attr('option-id'));
+          $input.attr('data-attr-name', this._getAttributeCodeById(attributeId));
+          $this.addClass('selected');
+          $widget._toggleCheckedAttributes($this, $wrapper);
+        }
+
+        $widget._Rebuild();
+
+        if ($widget.element.parents($widget.options.selectorProduct)
+          .find(this.options.selectorProductPrice).is(':data(mage-priceBox)')
+        ) {
+          $widget._UpdatePrice();
+        }
+
+        $widget._loadMedia();
+        $input.trigger('change');
+      },
+      _toggleCheckedAttributes: function ($this, $wrapper) {
+        $wrapper.attr('aria-activedescendant', $this.attr('id'))
+          .find('.' + this.options.classes.optionContainerClass).attr('aria-selected', false);
+        $this.attr('aria-selected', true);
+      },
+      _UpdatePrice: function () {
+        var $widget = this,
+          $product = $widget.element.parents($widget.options.selectorProduct),
+          $productPrice = $product.find(this.options.selectorProductPrice),
+          options = _.object(_.keys($widget.optionsMap), {}),
+          result,
+          tierPriceHtml;
+
+        $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
+          var attributeId = $(this).attr('attribute-id');
+
+          options[attributeId] = $(this).attr('option-selected');
+        });
+
+        result = $widget.options.jsonConfig.optionPrices[_.findKey($widget.options.jsonConfig.index, options)];
+
+        $productPrice.trigger(
+          'updatePrice', {
+            'prices': $widget._getPrices(result, $productPrice.priceBox('option').prices)
+          }
+        );
+
+        if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
+          $(this.options.slyOldPriceSelector).show();
+        } else {
+          $(this.options.slyOldPriceSelector).hide();
+        }
+
+        if (typeof result != 'undefined' && result.tierPrices.length) {
+          if (this.options.tierPriceTemplate) {
+            tierPriceHtml = mageTemplate(
+              this.options.tierPriceTemplate, {
+                'tierPrices': result.tierPrices,
+                '$t': $t,
+                'currencyFormat': this.options.jsonConfig.currencyFormat,
+                'priceUtils': priceUtils
+              }
+            );
+            $(this.options.tierPriceBlockSelector).html(tierPriceHtml).show();
+          }
+        } else {
+          $(this.options.tierPriceBlockSelector).hide();
+        }
+
+        $(this.options.normalPriceLabelSelector).hide();
+
+        _.each($('.' + this.options.classes.attributeOptionsWrapper), function (attribute) {
+          if ($(attribute).find('.' + this.options.classes.optionContainerClass + '.selected').length === 0) {
+            if ($(attribute).find('.' + this.options.classes.selectClass).length > 0) {
+              _.each($(attribute).find('.' + this.options.classes.selectClass), function (dropdown) {
+                if ($(dropdown).val() === '0') {
+                  $(this.options.normalPriceLabelSelector).show();
+                }
+              }.bind(this));
+            } else {
+              $(this.options.normalPriceLabelSelector).show();
+            }
+          }
+        }.bind(this));
+      },
+      _EnableProductMediaLoader: function ($this) {
+        var $widget = this;
+
+        if ($('body.catalog-product-view').length > 0) {
+          $this.parents('.column.main').find('.photo.image')
+            .addClass($widget.options.classes.loader);
+        } else {
+          //Category View
+          $this.parents('.product-item-info')
+            .find('.lazyload-wrapper')
+            .append('<div class="loader loader--visible"><div class="loader__circle"></div></div>');
+        }
+      },
+      _DisableProductMediaLoader: function ($this) {
+        var $widget = this;
+
+        if ($('body.catalog-product-view').length > 0) {
+          $this.parents('.column.main').find('.photo.image')
+            .removeClass($widget.options.classes.loader);
+        } else {
+          //Category View
+          $this.parents('.product-item-info').find('.loader').remove();
+        }
+      }
+    });
+
+    return $.mage.SwatchRenderer;
+  }
+});
diff --git a/Magento_Swatches/web/js/swatch-renderer.js b/Magento_Swatches/web/js/swatch-renderer.js
deleted file mode 100644
index e00001482..000000000
--- a/Magento_Swatches/web/js/swatch-renderer.js
+++ /dev/null
@@ -1,1310 +0,0 @@
-define([
-  'jquery',
-  'underscore',
-  'mage/template',
-  'mage/smart-keyboard-handler',
-  'mage/translate',
-  'priceUtils',
-  'jquery/ui',
-  'jquery/jquery.parsequery',
-  'mage/validation/validation'
-], function ($, _, mageTemplate, keyboardHandler, $t, priceUtils) {
-  'use strict';
-
-  /**
-   * Extend form validation to support swatch accessibility
-   */
-  $.widget('mage.validation', $.mage.validation, {
-      /**
-       * Handle form with swatches validation. Focus on first invalid swatch block.
-       *
-       * @param {jQuery.Event} event
-       * @param {Object} validation
-       */
-      listenFormValidateHandler: function (event, validation) {
-          var swatchWrapper, firstActive, swatches, swatch, successList, errorList, firstSwatch;
-
-          this._superApply(arguments);
-
-          swatchWrapper = '.swatch-attribute-options';
-          swatches = $(event.target).find(swatchWrapper);
-
-          if (!swatches.length) {
-              return;
-          }
-
-          swatch = '.swatch-attribute';
-          firstActive = $(validation.errorList[0].element || []);
-          successList = validation.successList;
-          errorList = validation.errorList;
-          firstSwatch = $(firstActive).parent(swatch).find(swatchWrapper);
-
-          keyboardHandler.focus(swatches);
-
-          $.each(successList, function (index, item) {
-              $(item).parent(swatch).find(swatchWrapper).attr('aria-invalid', false);
-          });
-
-          $.each(errorList, function (index, item) {
-              $(item.element).parent(swatch).find(swatchWrapper).attr('aria-invalid', true);
-          });
-
-          if (firstSwatch.length) {
-              $(firstSwatch).focus();
-          }
-      }
-  });
-
-  /**
-   * Render tooltips by attributes (only to up).
-   * Required element attributes:
-   *  - option-type (integer, 0-3)
-   *  - option-label (string)
-   *  - option-tooltip-thumb
-   *  - option-tooltip-value
-   *  - thumb - width
-   *  - thumb - height
-   */
-  $.widget('mage.SwatchRendererTooltip', {
-      options: {
-          delay: 200,                             //how much ms before tooltip to show
-          tooltipClass: 'swatch__tooltip'  //configurable, but remember about css
-      },
-
-      /**
-       * @private
-       */
-      _init: function () {
-          var $widget = this,
-              $this = this.element,
-              $element = $('.' + $widget.options.tooltipClass),
-              timer,
-              type = parseInt($this.attr('option-type'), 10),
-              label = $this.attr('option-label'),
-              thumb = $this.attr('option-tooltip-thumb'),
-              value = $this.attr('option-tooltip-value'),
-              width = $this.attr('thumb-width'),
-              height = $this.attr('thumb-height'),
-              $image,
-              $title,
-              $corner;
-
-          if (!$element.length) {
-              $element = $('<div class="' +
-                  $widget.options.tooltipClass +
-                  '"><div class="image"></div><div class="title"></div><div class="corner"></div></div>'
-              );
-              $('body').append($element);
-          }
-
-          $image = $element.find('.image');
-          $title = $element.find('.title');
-          $corner = $element.find('.corner');
-
-          $this.hover(function () {
-              if (!$this.hasClass('disabled')) {
-                  timer = setTimeout(
-                      function () {
-                          var leftOpt = null,
-                              leftCorner = 0,
-                              left,
-                              $window;
-
-                          if (type === 2) {
-                              // Image
-                              $image.css({
-                                  'background': 'url("' + thumb + '") no-repeat center', //Background case
-                                  'background-size': 'initial',
-                                  'width': width + 'px',
-                                  'height': height + 'px'
-                              });
-                              $image.show();
-                          } else if (type === 1) {
-                              // Color
-                              $image.css({
-                                  background: value
-                              });
-                              $image.show();
-                          } else if (type === 0 || type === 3) {
-                              // Default
-                              $image.hide();
-                          }
-
-                          $title.text(label);
-
-                          leftOpt = $this.offset().left;
-                          left = leftOpt + $this.width() / 2 - $element.width() / 2;
-                          $window = $(window);
-
-                          // the numbers (5 and 5) is magick constants for offset from left or right page
-                          if (left < 0) {
-                              left = 5;
-                          } else if (left + $element.width() > $window.width()) {
-                              left = $window.width() - $element.width() - 5;
-                          }
-
-                          // the numbers (6,  3 and 18) is magick constants for offset tooltip
-                          leftCorner = 0;
-
-                          if ($element.width() < $this.width()) {
-                              leftCorner = $element.width() / 2 - 3;
-                          } else {
-                              leftCorner = (leftOpt > left ? leftOpt - left : left - leftOpt) + $this.width() / 2 - 6;
-                          }
-
-                          $corner.css({
-                              left: leftCorner
-                          });
-                          $element.css({
-                              left: left,
-                              top: $this.offset().top - $element.height() - $corner.height() - 18
-                          }).show();
-                      },
-                      $widget.options.delay
-                  );
-              }
-          }, function () {
-              $element.hide();
-              clearTimeout(timer);
-          });
-
-          $(document).on('tap', function () {
-              $element.hide();
-              clearTimeout(timer);
-          });
-
-          $this.on('tap', function (event) {
-              event.stopPropagation();
-          });
-      }
-  });
-
-  /**
-   * Render swatch controls with options and use tooltips.
-   * Required two json:
-   *  - jsonConfig (magento's option config)
-   *  - jsonSwatchConfig (swatch's option config)
-   *
-   *  Tuning:
-   *  - numberToShow (show "more" button if options are more)
-   *  - onlySwatches (hide selectboxes)
-   *  - moreButtonText (text for "more" button)
-   *  - selectorProduct (selector for product container)
-   *  - selectorProductPrice (selector for change price)
-   */
-  $.widget('mage.SwatchRenderer', {
-      options: {
-          classes: {
-              attributeClass: 'swatch',
-              attributeLabelClass: 'swatch__title product-view__swatch-option-title',
-              attributeSelectedOptionLabelClass: 'swatch__selected-option',
-              attributeOptionsWrapper: 'swatch__wrapper',
-              attributeInput: 'swatch__input',
-              optionClass: 'swatch__option',
-              optionContainerClass: 'swatch__option-container',
-              selectClass: 'swatch-select',
-              moreButton: 'swatch-more',
-              loader: 'swatch-option-loading'
-          },
-          // option's json config
-          jsonConfig: {},
-
-          // swatch's json config
-          jsonSwatchConfig: {},
-
-          // selector of parental block of prices and swatches (need to know where to seek for price block)
-          selectorProduct: '.product-info-main',
-
-          // selector of price wrapper (need to know where set price)
-          selectorProductPrice: '[data-role=priceBox]',
-
-          //selector of product images gallery wrapper
-          mediaGallerySelector: '[data-gallery-role=gallery-placeholder]',
-
-          // selector of category product tile wrapper
-          selectorProductTile: '.product-item',
-
-          // number of controls to show (false or zero = show all)
-          numberToShow: false,
-
-          // show only swatch controls
-          onlySwatches: false,
-
-          // enable label for control
-          enableControlLabel: true,
-
-          // control label id
-          controlLabelId: '',
-
-          // text for more button
-          moreButtonText: $t('More'),
-
-          // Callback url for media
-          mediaCallback: '',
-
-          // Local media cache
-          mediaCache: {},
-
-          // Cache for BaseProduct images. Needed when option unset
-          mediaGalleryInitial: [{}],
-
-          // Use ajax to get image data
-          useAjax: false,
-
-          /**
-           * Defines the mechanism of how images of a gallery should be
-           * updated when user switches between configurations of a product.
-           *
-           * As for now value of this option can be either 'replace' or 'prepend'.
-           *
-           * @type {String}
-           */
-          gallerySwitchStrategy: 'replace',
-
-          // whether swatches are rendered in product list or on product page
-          inProductList: false,
-
-          // sly-old-price block selector
-          slyOldPriceSelector: '.sly-old-price',
-
-          // tier prise selectors start
-          tierPriceTemplateSelector: '#tier-prices-template',
-          tierPriceBlockSelector: '[data-role="tier-price-block"]',
-          tierPriceTemplate: '',
-          // tier prise selectors end
-
-          // A price label selector
-          normalPriceLabelSelector: '.normal-price .price-label'
-      },
-
-      /**
-       * Get chosen product
-       *
-       * @returns int|null
-       */
-      getProduct: function () {
-          var products = this._CalcProducts();
-
-          return _.isArray(products) ? products[0] : null;
-      },
-
-      /**
-       * @private
-       */
-      _init: function () {
-          if (_.isEmpty(this.options.jsonConfig.images)) {
-              this.options.useAjax = true;
-              // creates debounced variant of _LoadProductMedia()
-              // to use it in events handlers instead of _LoadProductMedia()
-              this._debouncedLoadProductMedia = _.debounce(this._LoadProductMedia.bind(this), 500);
-          }
-
-          if (this.options.jsonConfig !== '' && this.options.jsonSwatchConfig !== '') {
-              // store unsorted attributes
-              this.options.jsonConfig.mappedAttributes = _.clone(this.options.jsonConfig.attributes);
-              this._sortAttributes();
-              this._RenderControls();
-              this._setPreSelectedGallery();
-              $(this.element).trigger('swatch.initialized');
-          } else {
-              console.log('SwatchRenderer: No input data received');
-          }
-          this.options.tierPriceTemplate = $(this.options.tierPriceTemplateSelector).html();
-      },
-
-      /**
-       * @private
-       */
-      _sortAttributes: function () {
-          this.options.jsonConfig.attributes = _.sortBy(this.options.jsonConfig.attributes, function (attribute) {
-              return attribute.position;
-          });
-      },
-
-      /**
-       * @private
-       */
-      _create: function () {
-          var options = this.options,
-              gallery = $('[data-gallery-role=gallery-placeholder]', '.column.main'),
-              productData = this._determineProductData(),
-              $main = productData.isInProductView ?
-                  this.element.parents('.column.main') :
-                  this.element.parents('.product-item-info');
-
-          if (productData.isInProductView) {
-              gallery.data('gallery') ?
-                  this._onGalleryLoaded(gallery) :
-                  gallery.on('gallery:loaded', this._onGalleryLoaded.bind(this, gallery));
-          } else {
-              options.mediaGalleryInitial = [{
-                  'img': $main.find('.product-image-photo').attr('src')
-              }];
-          }
-
-          this.productForm = this.element.parents(this.options.selectorProductTile).find('form:first');
-          this.inProductList = this.productForm.length > 0;
-      },
-
-      /**
-       * Determine product id and related data
-       *
-       * @returns {{productId: *, isInProductView: bool}}
-       * @private
-       */
-      _determineProductData: function () {
-          // Check if product is in a list of products.
-          var productId,
-              isInProductView = false;
-
-          productId = this.element.parents('.product-item-details')
-                  .find('.price-box.price-final_price').attr('data-product-id');
-
-          if (!productId) {
-              // Check individual product.
-              productId = $('[name=product]').val();
-              isInProductView = productId > 0;
-          }
-
-          return {
-              productId: productId,
-              isInProductView: isInProductView
-          };
-      },
-
-      /**
-       * Render controls
-       *
-       * @private
-       */
-      _RenderControls: function () {
-          var $widget = this,
-              container = this.element,
-              classes = this.options.classes,
-              chooseText = this.options.jsonConfig.chooseText;
-
-          $widget.optionsMap = {};
-
-          $.each(this.options.jsonConfig.attributes, function () {
-              var item = this,
-                  controlLabelId = 'option-label-' + item.code + '-' + item.id,
-                  options = $widget._RenderSwatchOptions(item, controlLabelId),
-                  select = $widget._RenderSwatchSelect(item, chooseText),
-                  input = $widget._RenderFormInput(item),
-                  listLabel = '',
-                  label = '';
-
-              // Show only swatch controls
-              if ($widget.options.onlySwatches && !$widget.options.jsonSwatchConfig.hasOwnProperty(item.id)) {
-                  return;
-              }
-
-              if ($widget.options.enableControlLabel) {
-                  label +=
-                      '<span id="' + controlLabelId + '" class="' + classes.attributeLabelClass + '">' +
-                          item.label +
-                      '</span>' +
-                      '<span class="' + classes.attributeSelectedOptionLabelClass + '"></span>';
-              }
-
-              if ($widget.inProductList) {
-                  $widget.productForm.append(input);
-                  input = '';
-                  listLabel = 'aria-label="' + item.label + '"';
-              } else {
-                  listLabel = 'aria-labelledby="' + controlLabelId + '"';
-              }
-
-              // Create new control
-              container.append(
-                  '<div class="' + classes.attributeClass + ' ' + item.code + '" ' +
-                       'attribute-code="' + item.code + '" ' +
-                       'attribute-id="' + item.id + '">' +
-                      label +
-                      '<div aria-activedescendant="" ' +
-                           'tabindex="0" ' +
-                           'aria-invalid="false" ' +
-                           'aria-required="true" ' +
-                           'role="listbox" ' + listLabel +
-                           'class="' + classes.attributeOptionsWrapper + '">' +
-                          options + select +
-                      '</div>' + input +
-                  '</div>'
-              );
-
-              $widget.optionsMap[item.id] = {};
-
-              // Aggregate options array to hash (key => value)
-              $.each(item.options, function () {
-                  if (this.products.length > 0) {
-                      $widget.optionsMap[item.id][this.id] = {
-                          price: parseInt(
-                              $widget.options.jsonConfig.optionPrices[this.products[0]].finalPrice.amount,
-                              10
-                          ),
-                          products: this.products
-                      };
-                  }
-              });
-          });
-
-          // Connect Tooltip
-          container
-              .find('[option-type="1"], [option-type="2"], [option-type="0"], [option-type="3"]')
-              .SwatchRendererTooltip();
-
-          // Hide all elements below more button
-          $('.' + classes.moreButton).nextAll().hide();
-
-          // Handle events like click or change
-          $widget._EventListener();
-
-          // Rewind options
-          $widget._Rewind(container);
-
-          //Emulate click on all swatches from Request
-          $widget._EmulateSelected($.parseQuery());
-          $widget._EmulateSelected($widget._getSelectedAttributes());
-      },
-
-      /**
-       * Render swatch options by part of config
-       *
-       * @param {Object} config
-       * @param {String} controlId
-       * @returns {String}
-       * @private
-       */
-      _RenderSwatchOptions: function (config, controlId) {
-          var optionConfig = this.options.jsonSwatchConfig[config.id],
-              optionClass = this.options.classes.optionClass,
-              optionContainerClass = this.options.classes.optionContainerClass,
-              moreLimit = parseInt(this.options.numberToShow, 10),
-              moreClass = this.options.classes.moreButton,
-              moreText = this.options.moreButtonText,
-              countAttributes = 0,
-              html = '';
-
-          if (!this.options.jsonSwatchConfig.hasOwnProperty(config.id)) {
-              return '';
-          }
-
-          $.each(config.options, function () {
-              var id,
-                  type,
-                  value,
-                  thumb,
-                  label,
-                  attr;
-
-              if (!optionConfig.hasOwnProperty(this.id)) {
-                  return '';
-              }
-
-              // Add more button
-              if (moreLimit === countAttributes++) {
-                  html += '<a href="#" class="' + moreClass + '">' + moreText + '</a>';
-              }
-
-              id = this.id;
-              type = parseInt(optionConfig[id].type, 10);
-              value = optionConfig[id].hasOwnProperty('value') ? optionConfig[id].value : '';
-              thumb = optionConfig[id].hasOwnProperty('thumb') ? optionConfig[id].thumb : '';
-              label = this.label ? this.label : '';
-              attr =
-                  ' id="' + controlId + '-item-' + id + '"' +
-                  ' aria-selected="false"' +
-                  ' aria-describedby="' + controlId + '"' +
-                  ' tabindex="0"' +
-                  ' option-type="' + type + '"' +
-                  ' option-id="' + id + '"' +
-                  ' option-label="' + label + '"' +
-                  ' aria-label="' + label + '"' +
-                  ' option-tooltip-thumb="' + thumb + '"' +
-                  ' option-tooltip-value="' + value + '"' +
-                  ' role="option"';
-
-              if (!this.hasOwnProperty('products') || this.products.length <= 0) {
-                  attr += ' option-empty="true"';
-              }
-
-              html += '<div class="' + optionContainerClass + '" ' + attr + '><div class="' + optionClass;
-              if (type === 0) {
-                  // Text
-                  html += '">' + (value ? value : label);
-              } else if (type === 1) {
-                  // Color
-                  if  (value === '#ffffff') {
-                    html += ' ' + optionClass + '--white';
-                  }
-                  html += '" style="background-color: ' + value + '">';
-              } else if (type === 2) {
-                  // Image
-                  html += ' ' + optionClass + '--image"' + ' style="background-image: url(' + value + ')">';
-              } else if (type === 3) {
-                  // Clear
-                  html += '">';
-              } else {
-                  // Default
-                  html += '">' + label;
-              }
-              html += '</div></div>'
-          });
-
-          return html;
-      },
-
-      /**
-       * Render select by part of config
-       *
-       * @param {Object} config
-       * @param {String} chooseText
-       * @returns {String}
-       * @private
-       */
-      _RenderSwatchSelect: function (config, chooseText) {
-          var html;
-
-          if (this.options.jsonSwatchConfig.hasOwnProperty(config.id)) {
-              return '';
-          }
-
-          html =
-              '<select class="' + this.options.classes.selectClass + ' ' + config.code + '">' +
-              '<option value="0" option-id="0">' + chooseText + '</option>';
-
-          $.each(config.options, function () {
-              var label = this.label,
-                  attr = ' value="' + this.id + '" option-id="' + this.id + '"';
-
-              if (!this.hasOwnProperty('products') || this.products.length <= 0) {
-                  attr += ' option-empty="true"';
-              }
-
-              html += '<option ' + attr + '>' + label + '</option>';
-          });
-
-          html += '</select>';
-
-          return html;
-      },
-
-      /**
-       * Input for submit form.
-       * This control shouldn't have "type=hidden", "display: none" for validation work :(
-       *
-       * @param {Object} config
-       * @private
-       */
-      _RenderFormInput: function (config) {
-          return '<input class="' + this.options.classes.attributeInput + ' super-attribute-select" ' +
-              'name="super_attribute[' + config.id + ']" ' +
-              'type="text" ' +
-              'value="" ' +
-              'data-selector="super_attribute[' + config.id + ']" ' +
-              'data-validate="{required: true}" ' +
-              'aria-required="true" ' +
-              'aria-invalid="false">';
-      },
-
-      /**
-       * Event listener
-       *
-       * @private
-       */
-      _EventListener: function () {
-          var $widget = this,
-              options = this.options.classes,
-              target;
-
-          $widget.element.on('click', '.' + options.optionContainerClass, function () {
-              return $widget._OnClick($(this), $widget);
-          });
-
-          $widget.element.on('change', '.' + options.selectClass, function () {
-              return $widget._OnChange($(this), $widget);
-          });
-
-          $widget.element.on('click', '.' + options.moreButton, function (e) {
-              e.preventDefault();
-
-              return $widget._OnMoreClick($(this));
-          });
-
-          $widget.element.on('keydown', function (e) {
-              if (e.which === 13) {
-                  target = $(e.target);
-
-                  if (target.is('.' + options.optionContainerClass)) {
-                      return $widget._OnClick(target, $widget);
-                  } else if (target.is('.' + options.selectClass)) {
-                      return $widget._OnChange(target, $widget);
-                  } else if (target.is('.' + options.moreButton)) {
-                      e.preventDefault();
-
-                      return $widget._OnMoreClick(target);
-                  }
-              }
-          });
-      },
-
-      /**
-       * Load media gallery using ajax or json config.
-       *
-       * @private
-       */
-      _loadMedia: function () {
-          var $main = this.inProductList ?
-                  this.element.parents('.product-item-info') :
-                  this.element.parents('.column.main'),
-              images;
-
-          if (this.options.useAjax) {
-              this._debouncedLoadProductMedia();
-          } else {
-              images = this.options.jsonConfig.images[this.getProduct()];
-
-              if (!images) {
-                  images = this.options.mediaGalleryInitial;
-              }
-
-              this.updateBaseImage(images, $main, !this.inProductList);
-          }
-      },
-
-      /**
-       * Event for swatch options
-       *
-       * @param {Object} $this
-       * @param {Object} $widget
-       * @private
-       */
-      _OnClick: function ($this, $widget) {
-          var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
-              $wrapper = $this.parents('.' + $widget.options.classes.attributeOptionsWrapper),
-              $label = $parent.find('.' + $widget.options.classes.attributeSelectedOptionLabelClass),
-              attributeId = $parent.attr('attribute-id'),
-              $input = $parent.find('.' + $widget.options.classes.attributeInput);
-
-          if ($widget.inProductList) {
-              $input = $widget.productForm.find(
-                  '.' + $widget.options.classes.attributeInput + '[name="super_attribute[' + attributeId + ']"]'
-              );
-          }
-
-          if ($this.hasClass('disabled')) {
-              return;
-          }
-
-          if ($this.hasClass('selected')) {
-              $parent.removeAttr('option-selected').find('.selected').removeClass('selected');
-              $input.val('');
-              $label.text('');
-              $this.attr('aria-selected', false);
-          } else {
-              $parent.attr('option-selected', $this.attr('option-id')).find('.selected').removeClass('selected');
-              $label.text($this.attr('option-label'));
-              $input.val($this.attr('option-id'));
-              $input.attr('data-attr-name', this._getAttributeCodeById(attributeId));
-              $this.addClass('selected');
-              $widget._toggleCheckedAttributes($this, $wrapper);
-          }
-
-          $widget._Rebuild();
-
-          if ($widget.element.parents($widget.options.selectorProduct)
-                  .find(this.options.selectorProductPrice).is(':data(mage-priceBox)')
-          ) {
-              $widget._UpdatePrice();
-          }
-
-          $widget._loadMedia();
-          $input.trigger('change');
-      },
-
-      /**
-       * Get human readable attribute code (eg. size, color) by it ID from configuration
-       *
-       * @param {Number} attributeId
-       * @returns {*}
-       * @private
-       */
-      _getAttributeCodeById: function (attributeId) {
-          var attribute = this.options.jsonConfig.mappedAttributes[attributeId];
-
-          return attribute ? attribute.code : attributeId;
-      },
-
-      /**
-       * Toggle accessibility attributes
-       *
-       * @param {Object} $this
-       * @param {Object} $wrapper
-       * @private
-       */
-      _toggleCheckedAttributes: function ($this, $wrapper) {
-          $wrapper.attr('aria-activedescendant', $this.attr('id'))
-                  .find('.' + this.options.classes.optionContainerClass).attr('aria-selected', false);
-          $this.attr('aria-selected', true);
-      },
-
-      /**
-       * Event for select
-       *
-       * @param {Object} $this
-       * @param {Object} $widget
-       * @private
-       */
-      _OnChange: function ($this, $widget) {
-          var $parent = $this.parents('.' + $widget.options.classes.attributeClass),
-              attributeId = $parent.attr('attribute-id'),
-              $input = $parent.find('.' + $widget.options.classes.attributeInput);
-
-          if ($widget.productForm.length > 0) {
-              $input = $widget.productForm.find(
-                  '.' + $widget.options.classes.attributeInput + '[name="super_attribute[' + attributeId + ']"]'
-              );
-          }
-
-          if ($this.val() > 0) {
-              $parent.attr('option-selected', $this.val());
-              $input.val($this.val());
-          } else {
-              $parent.removeAttr('option-selected');
-              $input.val('');
-          }
-
-          $widget._Rebuild();
-          $widget._UpdatePrice();
-          $widget._loadMedia();
-          $input.trigger('change');
-      },
-
-      /**
-       * Event for more switcher
-       *
-       * @param {Object} $this
-       * @private
-       */
-      _OnMoreClick: function ($this) {
-          $this.nextAll().show();
-          $this.blur().remove();
-      },
-
-      /**
-       * Rewind options for controls
-       *
-       * @private
-       */
-      _Rewind: function (controls) {
-          controls.find('div[option-id], option[option-id]').removeClass('disabled').removeAttr('disabled');
-          controls.find('div[option-empty], option[option-empty]').attr('disabled', true).addClass('disabled');
-      },
-
-      /**
-       * Rebuild container
-       *
-       * @private
-       */
-      _Rebuild: function () {
-          var $widget = this,
-              controls = $widget.element.find('.' + $widget.options.classes.attributeClass + '[attribute-id]'),
-              selected = controls.filter('[option-selected]');
-
-          // Enable all options
-          $widget._Rewind(controls);
-
-          // done if nothing selected
-          if (selected.length <= 0) {
-              return;
-          }
-
-          // Disable not available options
-          controls.each(function () {
-              var $this = $(this),
-                  id = $this.attr('attribute-id'),
-                  products = $widget._CalcProducts(id);
-
-              if (selected.length === 1 && selected.first().attr('attribute-id') === id) {
-                  return;
-              }
-
-              $this.find('[option-id]').each(function () {
-                  var $element = $(this),
-                      option = $element.attr('option-id');
-
-                  if (!$widget.optionsMap.hasOwnProperty(id) || !$widget.optionsMap[id].hasOwnProperty(option) ||
-                      $element.hasClass('selected') ||
-                      $element.is(':selected')) {
-                      return;
-                  }
-
-                  if (_.intersection(products, $widget.optionsMap[id][option].products).length <= 0) {
-                      $element.attr('disabled', true).addClass('disabled');
-                  }
-              });
-          });
-      },
-
-      /**
-       * Get selected product list
-       *
-       * @returns {Array}
-       * @private
-       */
-      _CalcProducts: function ($skipAttributeId) {
-          var $widget = this,
-              products = [];
-
-          // Generate intersection of products
-          $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
-              var id = $(this).attr('attribute-id'),
-                  option = $(this).attr('option-selected');
-
-              if ($skipAttributeId !== undefined && $skipAttributeId === id) {
-                  return;
-              }
-
-              if (!$widget.optionsMap.hasOwnProperty(id) || !$widget.optionsMap[id].hasOwnProperty(option)) {
-                  return;
-              }
-
-              if (products.length === 0) {
-                  products = $widget.optionsMap[id][option].products;
-              } else {
-                  products = _.intersection(products, $widget.optionsMap[id][option].products);
-              }
-          });
-
-          return products;
-      },
-
-      /**
-       * Update total price
-       *
-       * @private
-       */
-      _UpdatePrice: function () {
-          var $widget = this,
-              $product = $widget.element.parents($widget.options.selectorProduct),
-              $productPrice = $product.find(this.options.selectorProductPrice),
-              options = _.object(_.keys($widget.optionsMap), {}),
-              result,
-              tierPriceHtml;
-
-          $widget.element.find('.' + $widget.options.classes.attributeClass + '[option-selected]').each(function () {
-              var attributeId = $(this).attr('attribute-id');
-
-              options[attributeId] = $(this).attr('option-selected');
-          });
-
-          result = $widget.options.jsonConfig.optionPrices[_.findKey($widget.options.jsonConfig.index, options)];
-
-          $productPrice.trigger(
-              'updatePrice',
-              {
-                  'prices': $widget._getPrices(result, $productPrice.priceBox('option').prices)
-              }
-          );
-
-          if (typeof result != 'undefined' && result.oldPrice.amount !== result.finalPrice.amount) {
-              $(this.options.slyOldPriceSelector).show();
-          } else {
-              $(this.options.slyOldPriceSelector).hide();
-          }
-
-          if (typeof result != 'undefined' && result.tierPrices.length) {
-              if (this.options.tierPriceTemplate) {
-                  tierPriceHtml = mageTemplate(
-                      this.options.tierPriceTemplate,
-                      {
-                          'tierPrices': result.tierPrices,
-                          '$t': $t,
-                          'currencyFormat': this.options.jsonConfig.currencyFormat,
-                          'priceUtils': priceUtils
-                      }
-                  );
-                  $(this.options.tierPriceBlockSelector).html(tierPriceHtml).show();
-              }
-          } else {
-              $(this.options.tierPriceBlockSelector).hide();
-          }
-
-          $(this.options.normalPriceLabelSelector).hide();
-
-          _.each($('.' + this.options.classes.attributeOptionsWrapper), function (attribute) {
-            if ($(attribute).find('.' + this.options.classes.optionContainerClass + '.selected').length === 0) {
-              if ($(attribute).find('.' + this.options.classes.selectClass).length > 0) {
-                _.each($(attribute).find('.' + this.options.classes.selectClass), function (dropdown) {
-                  if ($(dropdown).val() === '0') {
-                    $(this.options.normalPriceLabelSelector).show();
-                  }
-                }.bind(this));
-              } else {
-                $(this.options.normalPriceLabelSelector).show();
-              }
-            }
-          }.bind(this));
-      },
-
-      /**
-       * Get prices
-       *
-       * @param {Object} newPrices
-       * @param {Object} displayPrices
-       * @returns {*}
-       * @private
-       */
-      _getPrices: function (newPrices, displayPrices) {
-          var $widget = this;
-
-          if (_.isEmpty(newPrices)) {
-              newPrices = $widget.options.jsonConfig.prices;
-          }
-
-          _.each(displayPrices, function (price, code) {
-              if (newPrices[code]) {
-                  displayPrices[code].amount = newPrices[code].amount - displayPrices[code].amount;
-              }
-          });
-
-          return displayPrices;
-      },
-
-      /**
-       * Gets all product media and change current to the needed one
-       *
-       * @private
-       */
-      _LoadProductMedia: function () {
-          var $widget = this,
-              $this = $widget.element,
-              productData = this._determineProductData(),
-              mediaCallData,
-              mediaCacheKey,
-
-              /**
-               * Processes product media data
-               *
-               * @param {Object} data
-               * @returns void
-               */
-              mediaSuccessCallback = function (data) {
-                  if (!(mediaCacheKey in $widget.options.mediaCache)) {
-                      $widget.options.mediaCache[mediaCacheKey] = data;
-                  }
-                  $widget._ProductMediaCallback($this, data, productData.isInProductView);
-                  setTimeout(function () {
-                      $widget._DisableProductMediaLoader($this);
-                  }, 300);
-              };
-
-          if (!$widget.options.mediaCallback) {
-              return;
-          }
-
-          mediaCallData = {
-              'product_id': this.getProduct()
-          };
-
-          mediaCacheKey = JSON.stringify(mediaCallData);
-
-          if (mediaCacheKey in $widget.options.mediaCache) {
-              $widget._XhrKiller();
-              $widget._EnableProductMediaLoader($this);
-              mediaSuccessCallback($widget.options.mediaCache[mediaCacheKey]);
-          } else {
-              mediaCallData.isAjax = true;
-              $widget._XhrKiller();
-              $widget._EnableProductMediaLoader($this);
-              $widget.xhr = $.get(
-                  $widget.options.mediaCallback,
-                  mediaCallData,
-                  mediaSuccessCallback,
-                  'json'
-              ).done(function () {
-                  $widget._XhrKiller();
-              });
-          }
-      },
-
-      /**
-       * Enable loader
-       *
-       * @param {Object} $this
-       * @private
-       */
-      _EnableProductMediaLoader: function ($this) {
-          var $widget = this;
-
-          if ($('body.catalog-product-view').length > 0) {
-              $this.parents('.column.main').find('.photo.image')
-                  .addClass($widget.options.classes.loader);
-          } else {
-              //Category View
-              $this.parents('.product-item-info')
-                  .find('.lazyload-wrapper')
-                  .append('<div class="loader loader--visible"><div class="loader__circle"></div></div>');
-          }
-      },
-
-      /**
-       * Disable loader
-       *
-       * @param {Object} $this
-       * @private
-       */
-      _DisableProductMediaLoader: function ($this) {
-          var $widget = this;
-
-          if ($('body.catalog-product-view').length > 0) {
-              $this.parents('.column.main').find('.photo.image')
-                  .removeClass($widget.options.classes.loader);
-          } else {
-              //Category View
-              $this.parents('.product-item-info').find('.loader').remove();
-          }
-      },
-
-      /**
-       * Callback for product media
-       *
-       * @param {Object} $this
-       * @param {String} response
-       * @param {Boolean} isInProductView
-       * @private
-       */
-      _ProductMediaCallback: function ($this, response, isInProductView) {
-          var $main = isInProductView ? $this.parents('.column.main') : $this.parents('.product-item-info'),
-              $widget = this,
-              images = [],
-
-              /**
-               * Check whether object supported or not
-               *
-               * @param {Object} e
-               * @returns {*|Boolean}
-               */
-              support = function (e) {
-                  return e.hasOwnProperty('large') && e.hasOwnProperty('medium') && e.hasOwnProperty('small');
-              };
-
-          if (_.size($widget) < 1 || !support(response)) {
-              this.updateBaseImage(this.options.mediaGalleryInitial, $main, isInProductView);
-
-              return;
-          }
-
-          images.push({
-              full: response.large,
-              img: response.medium,
-              thumb: response.small,
-              isMain: true
-          });
-
-          if (response.hasOwnProperty('gallery')) {
-              $.each(response.gallery, function () {
-                  if (!support(this) || response.large === this.large) {
-                      return;
-                  }
-                  images.push({
-                      full: this.large,
-                      img: this.medium,
-                      thumb: this.small
-                  });
-              });
-          }
-
-          this.updateBaseImage(images, $main, isInProductView);
-      },
-
-      /**
-       * Check if images to update are initial and set their type
-       * @param {Array} images
-       */
-      _setImageType: function (images) {
-          var initial = this.options.mediaGalleryInitial[0].img;
-
-          if (images[0].img === initial) {
-              images = $.extend(true, [], this.options.mediaGalleryInitial);
-          } else {
-              images.map(function (img) {
-                  if (!img.type) {
-                      img.type = 'image';
-                  }
-              });
-          }
-
-          return images;
-      },
-
-      /**
-       * Update [gallery-placeholder] or [product-image-photo]
-       * @param {Array} images
-       * @param {jQuery} context
-       * @param {Boolean} isInProductView
-       */
-      updateBaseImage: function (images, context, isInProductView) {
-          var justAnImage = images[0],
-              initialImages = this.options.mediaGalleryInitial,
-              gallery = context.find(this.options.mediaGallerySelector).data('gallery'),
-              imagesToUpdate,
-              isInitial;
-
-          if (isInProductView) {
-              imagesToUpdate = images.length ? this._setImageType($.extend(true, [], images)) : [];
-              isInitial = _.isEqual(imagesToUpdate, initialImages);
-
-              if (this.options.gallerySwitchStrategy === 'prepend' && !isInitial) {
-                  imagesToUpdate = imagesToUpdate.concat(initialImages);
-              }
-
-              imagesToUpdate = this._setImageIndex(imagesToUpdate);
-              gallery.updateData(imagesToUpdate);
-
-              if (isInitial) {
-                  $(this.options.mediaGallerySelector).AddFotoramaVideoEvents();
-              } else {
-                  $(this.options.mediaGallerySelector).AddFotoramaVideoEvents({
-                      selectedOption: this.getProduct(),
-                      dataMergeStrategy: this.options.gallerySwitchStrategy
-                  });
-              }
-
-              gallery.first();
-
-          } else if (justAnImage && justAnImage.img) {
-              context.find('.product-image-photo').attr('src', justAnImage.img);
-          }
-      },
-
-      /**
-       * Set correct indexes for image set.
-       *
-       * @param {Array} images
-       * @private
-       */
-      _setImageIndex: function (images) {
-          var length = images.length,
-              i;
-
-          for (i = 0; length > i; i++) {
-              images[i].i = i + 1;
-          }
-
-          return images;
-      },
-
-      /**
-       * Kill doubled AJAX requests
-       *
-       * @private
-       */
-      _XhrKiller: function () {
-          var $widget = this;
-
-          if ($widget.xhr !== undefined && $widget.xhr !== null) {
-              $widget.xhr.abort();
-              $widget.xhr = null;
-          }
-      },
-
-      /**
-       * Emulate mouse click on all swatches that should be selected
-       * @param {Object} [selectedAttributes]
-       * @private
-       */
-      _EmulateSelected: function (selectedAttributes) {
-          $.each(selectedAttributes, $.proxy(function (attributeCode, optionId) {
-              var elem = this.element.find('.' + this.options.classes.attributeClass +
-                  '[attribute-code="' + attributeCode + '"] [option-id="' + optionId + '"]'),
-                  parentInput = elem.parent();
-
-              if (elem.hasClass('selected')) {
-                  return;
-              }
-
-              if (parentInput.hasClass(this.options.classes.selectClass)) {
-                  parentInput.val(optionId);
-                  parentInput.trigger('change');
-              } else {
-                  elem.trigger('click');
-              }
-          }, this));
-      },
-
-      /**
-        * Emulate mouse click or selection change on all swatches that should be selected
-        * @param {Object} [selectedAttributes]
-        * @private
-        */
-      _EmulateSelectedByAttributeId: function (selectedAttributes) {
-        $.each(selectedAttributes, $.proxy(function (attributeId, optionId) {
-          var elem = this.element.find('.' + this.options.classes.attributeClass +
-              '[attribute-id="' + attributeId + '"] [option-id="' + optionId + '"]'),
-          parentInput = elem.parent();
-          if (elem.hasClass('selected')) {
-            return;
-          }
-          if (parentInput.hasClass(this.options.classes.selectClass)) {
-            parentInput.val(optionId);
-            parentInput.trigger('change');
-          } else {
-            elem.trigger('click');
-          }
-        }, this));
-      },
-
-      /**
-       * Get default options values settings with either URL query parameters
-       * @private
-       */
-      _getSelectedAttributes: function () {
-          var hashIndex = window.location.href.indexOf('#'),
-              selectedAttributes = {},
-              params;
-
-          if (hashIndex !== -1) {
-              params = $.parseQuery(window.location.href.substr(hashIndex + 1));
-
-              selectedAttributes = _.invert(_.mapObject(_.invert(params), function (attributeId) {
-                  var attribute = this.options.jsonConfig.mappedAttributes[attributeId];
-
-                  return attribute ? attribute.code : attributeId;
-              }.bind(this)));
-          }
-
-          return selectedAttributes;
-      },
-
-      /**
-       * Callback which fired after gallery gets initialized.
-       *
-       * @param {HTMLElement} element - DOM element associated with a gallery.
-       */
-      _onGalleryLoaded: function (element) {
-          var galleryObject = element.data('gallery');
-
-          this.options.mediaGalleryInitial = galleryObject.returnCurrentImages();
-      },
-
-      /**
-       * Sets mediaCache for cases when jsonConfig contains preSelectedGallery on layered navigation result pages
-       *
-       * @private
-       */
-      _setPreSelectedGallery: function () {
-          var mediaCallData;
-
-          if (this.options.jsonConfig.preSelectedGallery) {
-              mediaCallData = {
-                  'product_id': this.getProduct()
-              };
-
-              this.options.mediaCache[JSON.stringify(mediaCallData)] = this.options.jsonConfig.preSelectedGallery;
-          }
-      }
-  });
-
-  return $.mage.SwatchRenderer;
-});

From 6e5ac3818cb158a9e448282fbee4a60f29a57727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 7 Feb 2019 14:05:55 +0100
Subject: [PATCH 48/69] #49721 - Fix see-details dropdown in minicart

---
 Magento_Checkout/web/template/minicart/item/default.html | 5 ++---
 Magento_Theme/web/js/dropdown-list.babel.js              | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Magento_Checkout/web/template/minicart/item/default.html b/Magento_Checkout/web/template/minicart/item/default.html
index 156568df6..a28449887 100644
--- a/Magento_Checkout/web/template/minicart/item/default.html
+++ b/Magento_Checkout/web/template/minicart/item/default.html
@@ -33,7 +33,7 @@ <h3 class="minicart-product__name">
                                 minicart-product__attributes-button
                             "
                             aria-expanded="false"
-                            aria-controls="see-details"
+                            data-bind="attr: {'aria-controls': 'details-' + product_sku }"
                         >
                             <!-- ko i18n: 'See Details' --><!-- /ko -->
                             <svg class="icon dropdown-list__icon" role="img">
@@ -41,14 +41,13 @@ <h3 class="minicart-product__name">
                                 <use data-bind="attr: { 'xlink:href': require.toUrl('images/icons-sprite.svg#angle-down') }" xlink:href=''></use>
                             </svg>
                         </button>
-
                         <div
-                            id="see-details"
                             class="
                                 dropdown-list__content
                                 minicart-product__attributes-button
                             "
                             aria-hidden="true"
+                            data-bind="attr: {id: 'details-' + product_sku }"
                         >
                             <dl
                                 class="
diff --git a/Magento_Theme/web/js/dropdown-list.babel.js b/Magento_Theme/web/js/dropdown-list.babel.js
index c992dca8c..5d14170e9 100755
--- a/Magento_Theme/web/js/dropdown-list.babel.js
+++ b/Magento_Theme/web/js/dropdown-list.babel.js
@@ -54,7 +54,9 @@ class DropdownList {
         trigger.focus();
       } else if (opening) {
         this.setAriaAttributes(trigger, dropdownContent, false);
-        focusableElements[0].focus();
+        if (focusableElements[0]) {
+          focusableElements[0].focus();
+        }
       }
     }
   }

From c105ca89c0236240542e693823269fc16ab9adc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 7 Feb 2019 14:14:46 +0100
Subject: [PATCH 49/69] #49721 - Update rating title in catalog item

---
 Magento_Review/templates/helper/summary_short.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento_Review/templates/helper/summary_short.phtml b/Magento_Review/templates/helper/summary_short.phtml
index 83117f6ce..21669d0aa 100644
--- a/Magento_Review/templates/helper/summary_short.phtml
+++ b/Magento_Review/templates/helper/summary_short.phtml
@@ -6,7 +6,8 @@
     <?php if ($rating):?>
         <div
             class="rating__star"
-            title="rating <?= $rating ?>%"
+            aria-label="<?= __('Average rating') . ': ' . $rating . '%'; ?>"
+            title="<?= __('Average rating') . ': ' . $rating . '%'; ?>"
             style="width:<?= $rating ?>%"
         >
             <span class="rating__indicator"></span>

From ce258277ed107deb1289978669c6c96c4700fa6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Thu, 7 Feb 2019 14:22:59 +0100
Subject: [PATCH 50/69] #49721 - Update changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9521d5505..e86973ba8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,8 @@ All notable changes to this project will be documented in this file.
 - Duplicated `email` id on company users view
 - Duplicated `My wishlist` section in sidebar
 - Login form for disabled 'Guest Checkout'
+- Swatches in catalog and product page for magento 2.3.0
+- Details dropdown in minicart
 
 ## [1.1.0] - 2019-01-07
 ### Added

From 16cf1b57eb3de19406b9da1aa0f8da1d0be75952 Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Tue, 12 Feb 2019 12:31:15 +0100
Subject: [PATCH 51/69] #49294 - added missing tab-content

---
 Magento_Catalog/templates/product/view/details.phtml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Magento_Catalog/templates/product/view/details.phtml b/Magento_Catalog/templates/product/view/details.phtml
index e7b54fe15..9e19ef2d9 100644
--- a/Magento_Catalog/templates/product/view/details.phtml
+++ b/Magento_Catalog/templates/product/view/details.phtml
@@ -27,7 +27,10 @@
                 </svg>
             </div>
 
-            <div class="tab__content <?= ($tabId == 1) ? 'tab__content--active' : ''; ?>">
+            <div
+                class="tab__content <?= ($tabId == 1) ? 'tab__content--active' : ''; ?>"
+                data-content="tab-<?= $tabId; ?>"
+            >
                 <?= $html; ?>
             </div>
             <?php $tabId++; ?>

From 8e13c3fe3971da5aaa498c714a8fc8b1e4e4cee0 Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Tue, 19 Feb 2019 09:56:26 +0100
Subject: [PATCH 52/69] #49294 - deleted unused wrapper, added class to product
 image

---
 Magento_Catalog/templates/product/image_with_borders.phtml | 2 +-
 Magento_Catalog/templates/product/list/items.phtml         | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/Magento_Catalog/templates/product/image_with_borders.phtml b/Magento_Catalog/templates/product/image_with_borders.phtml
index 946f57ec1..56765bb49 100644
--- a/Magento_Catalog/templates/product/image_with_borders.phtml
+++ b/Magento_Catalog/templates/product/image_with_borders.phtml
@@ -2,7 +2,7 @@
 
 <div class="lazyload-wrapper">
     <img
-        class="image lazyload product-image-photo"
+        class="image product-image-photo catalog-grid-item__image lazyload"
         src="data:image/gif;base64,R0lGODlhAQABAAAAACH5BAEKAAEALAAAAAABAAEAAAICTAEAOw=="
         data-src="<?= $block->getImageUrl() ?>"
         alt="<?= $block->stripTags($block->getLabel(), null, true) ?>"
diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
index c6252b081..e84454b6d 100644
--- a/Magento_Catalog/templates/product/list/items.phtml
+++ b/Magento_Catalog/templates/product/list/items.phtml
@@ -191,9 +191,7 @@ switch ($type = $block->getType()) {
                                 href="<?= $block->getProductUrl($_item) ?>"
                                 class="catalog-grid-item__link"
                             >
-                                <div class="catalog-grid-item__image-wrapper">
-                                    <?= $block->getImage($_item, $image)->toHtml() ?>
-                                </div>
+                                <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
 
                             <section

From 2a3d5548379596fcb1de839e6544bb13853a764d Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Thu, 21 Feb 2019 19:24:19 +0100
Subject: [PATCH 53/69] #49294 - Updated releated classes

---
 .../templates/product/list/items.phtml        | 119 ++++++++----------
 1 file changed, 53 insertions(+), 66 deletions(-)

diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
index e84454b6d..24092171d 100644
--- a/Magento_Catalog/templates/product/list/items.phtml
+++ b/Magento_Catalog/templates/product/list/items.phtml
@@ -194,90 +194,77 @@ switch ($type = $block->getType()) {
                                 <?= $block->getImage($_item, $image)->toHtml() ?>
                             </a>
 
-                            <section
-                                class="
-                                    catalog-grid-item__flex-wrapper
-                                    catalog-grid-item__main
-                                "
-                            >
+                            <section class="catalog-grid-item__details">
                                 <h2 class="catalog-grid-item__name">
                                     <a
                                         href="<?= $block->getProductUrl($_item) ?>"
-                                        class="catalog-grid-item__link"
+                                        class="catalog-grid-item__link catalog-grid-item__link--name"
                                         title="<?= $block->escapeHtml($_item->getName()) ?>"
                                     >
                                         <?= $block->escapeHtml($_item->getName()) ?>
                                     </a>
                                 </h2>
-
                                 <div class="catalog-grid-item__price">
                                     <?= $block->getProductPrice($_item) ?>
                                 </div>
-                            </section>
-
-
-                            <section class="catalog-grid-item__details">
                                 <?php if ($templateType): ?>
                                     <?= $block->getReviewsSummaryHtml($_item, $templateType) ?>
                                 <?php endif; ?>
-
-                                <div class="catalog-grid-item__flex-wrapper">
-                                    <div class="catalog-grid-item__name catalog-grid-item__name--one-line">
-                                        <a
-                                            href="<?= $block->getProductUrl($_item) ?>"
-                                            class="catalog-grid-item__link"
-                                            title="<?= $block->escapeHtml($_item->getName()) ?>"
-                                        >
-                                            <?= $block->escapeHtml($_item->getName()) ?>
-                                        </a>
-                                    </div>
-
-                                    <div class="catalog-grid-item__price">
-                                        <?= $block->getProductPrice($_item) ?>
-                                    </div>
-                                </div>
-
                                 <?php if ($showAddTo || $showCart): ?>
                                     <div class="catalog-grid-item__actions">
                                         <?php if ($showCart): ?>
                                             <?php if ($_item->isSaleable()): ?>
-                                                <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
-                                                    <button
-                                                        class="
-                                                            button
-                                                            button--secondary
-                                                            catalog-grid-item__primary-action
-                                                            tocart
-                                                        "
-                                                        data-mage-init='{
-                                                            "redirectUrl": {
-                                                                "url": "<?= $block->getAddToCartUrl($_item) ?>"
-                                                            }
-                                                        }'
-                                                        type="button"
-                                                        title="<?= __('Add to Cart') ?>"
-                                                    >
-                                                        <?= __('Add to Cart') ?>
-                                                    </button>
-                                                <?php else: ?>
-                                                    <?php
-                                                    $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
-                                                    $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
-                                                    ?>
-                                                    <button
-                                                        class="
-                                                            button
-                                                            button--secondary
-                                                            catalog-grid-item__primary-action
-                                                            tocart
-                                                        "
-                                                        data-post='<?= $postData ?>'
-                                                        type="button"
-                                                        title="<?= __('Add to Cart') ?>"
-                                                    >
-                                                        <?= __('Add to Cart') ?>
-                                                    </button>
-                                                <?php endif; ?>
+                                                <div class="catalog-grid-item__primary-form">
+                                                    <?php if ($_item->getTypeInstance()->hasRequiredOptions($_item)): ?>
+                                                        <button
+                                                            class="
+                                                                button
+                                                                button--secondary
+                                                                catalog-grid-item__primary-action
+                                                                tocart
+                                                            "
+                                                            data-mage-init='{
+                                                                "redirectUrl": {
+                                                                    "url": "<?= $block->getAddToCartUrl($_item) ?>"
+                                                                }
+                                                            }'
+                                                            type="button"
+                                                            title="<?= __('Add to Cart') ?>"
+                                                        >
+                                                            <span class="catalog-grid-item__cart-text">
+                                                                <?= __('Add to Cart') ?>
+                                                            </span>
+                                                            <svg class="icon catalog-grid-item__cart-icon">
+                                                                <title><?= __('Add to Cart') ?></title>
+                                                                <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#shopping-cart') ?>"></use>
+                                                            </svg>
+                                                        </button>
+                                                    <?php else: ?>
+                                                        <?php
+                                                        $postDataHelper = $this->helper('Magento\Framework\Data\Helper\PostHelper');
+                                                        $postData = $postDataHelper->getPostData($block->getAddToCartUrl($_item), ['product' => $_item->getEntityId()])
+                                                        ?>
+                                                        <button
+                                                            class="
+                                                                button
+                                                                button--secondary
+                                                                catalog-grid-item__primary-action
+                                                                tocart
+                                                            "
+                                                            data-post='<?= $postData ?>'
+                                                            type="button"
+                                                            title="<?= __('Add to Cart') ?>"
+                                                        >
+                                                            <span class="catalog-grid-item__cart-text">
+                                                                <?= __('Add to Cart') ?>
+                                                            </span>
+                                                            <svg class="icon catalog-grid-item__cart-icon">
+                                                                <title><?= __('Add to Cart') ?></title>
+                                                                <use xlink:href="<?= $block->getViewFileUrl('/images/icons-sprite.svg#shopping-cart') ?>"></use>
+                                                            </svg>
+                                                        </button>
+                                                    <?php endif; ?>
+                                                </div>
                                             <?php else: ?>
                                                 <?php if ($_item->getIsSalable()): ?>
                                                     <div class="stock available">

From 32c0a686d0140675f529a16699f3ed0f2e4c4402 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Fri, 22 Feb 2019 15:30:43 +0100
Subject: [PATCH 54/69] #49721 - Fix product price updating

---
 CHANGELOG.md                                     | 1 +
 Magento_Catalog/layout/catalog_product_view.xml  | 2 +-
 Magento_Catalog/templates/product/list.phtml     | 4 ++--
 Magento_Swatches/web/js/swatch-renderer-mixin.js | 6 +++---
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e86973ba8..07bf10729 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ All notable changes to this project will be documented in this file.
 - Login form for disabled 'Guest Checkout'
 - Swatches in catalog and product page for magento 2.3.0
 - Details dropdown in minicart
+- Price updating in configurable products
 
 ## [1.1.0] - 2019-01-07
 ### Added
diff --git a/Magento_Catalog/layout/catalog_product_view.xml b/Magento_Catalog/layout/catalog_product_view.xml
index d4cbae9d7..fa3fa5cb8 100644
--- a/Magento_Catalog/layout/catalog_product_view.xml
+++ b/Magento_Catalog/layout/catalog_product_view.xml
@@ -8,7 +8,7 @@
         <referenceContainer name="page.messages" htmlClass="page messages container" />
 
         <container name="product.container" htmlClass="product-view container" htmlTag="div">
-            <container name="product.wrapper" htmlClass="product-view__wrapper" htmlTag="section">
+            <container name="product.wrapper" htmlClass="product-view__wrapper product-info-main" htmlTag="section">
                 <container name="product.column.left" htmlClass="product-view__gallery" htmlTag="div">
                     <referenceContainer name="product.info.media" htmlClass="gallery galler--vertical" />
                 </container>
diff --git a/Magento_Catalog/templates/product/list.phtml b/Magento_Catalog/templates/product/list.phtml
index fc2e3fd08..987b72cec 100644
--- a/Magento_Catalog/templates/product/list.phtml
+++ b/Magento_Catalog/templates/product/list.phtml
@@ -37,7 +37,7 @@ use Magento\Framework\App\Action\Action;
                     catalog-list-item
                     catalog-list__item
                     product-item
-                    product-item-info
+                    product-item-details
                 "
             >
                 <?php $productImage = $block->getImage($_product, $imageDisplayArea) ?>
@@ -145,7 +145,7 @@ use Magento\Framework\App\Action\Action;
             <?php foreach ($_productCollection as $_product): ?>
                 <?php $productImage = $block->getImage($_product, $imageDisplayArea) ?>
                 <li
-                    class="catalog-grid-item product-item product-item-info"
+                    class="catalog-grid-item product-item-details"
                     data-container="product-grid"
                 >
                     <a
diff --git a/Magento_Swatches/web/js/swatch-renderer-mixin.js b/Magento_Swatches/web/js/swatch-renderer-mixin.js
index c98e87d2c..739cd245c 100644
--- a/Magento_Swatches/web/js/swatch-renderer-mixin.js
+++ b/Magento_Swatches/web/js/swatch-renderer-mixin.js
@@ -33,7 +33,7 @@ define([
         //selector of product images gallery wrapper
         mediaGallerySelector: '[data-gallery-role=gallery-placeholder]',
         // selector of category product tile wrapper
-        selectorProductTile: '.product-item',
+        selectorProductTile: '.product-item-details',
         // number of controls to show (false or zero = show all)
         numberToShow: false,
         // show only swatch controls
@@ -301,7 +301,7 @@ define([
             .addClass($widget.options.classes.loader);
         } else {
           //Category View
-          $this.parents('.product-item-info')
+          $this.parents('.product-item-details')
             .find('.lazyload-wrapper')
             .append('<div class="loader loader--visible"><div class="loader__circle"></div></div>');
         }
@@ -314,7 +314,7 @@ define([
             .removeClass($widget.options.classes.loader);
         } else {
           //Category View
-          $this.parents('.product-item-info').find('.loader').remove();
+          $this.parents('.product-item-details').find('.loader').remove();
         }
       }
     });

From f40aeaa2bc5e98ad7ae2535740bce46f8bcc769c Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Fri, 22 Feb 2019 15:50:25 +0100
Subject: [PATCH 55/69] #49294 - make shorter placeholder (1000-1400px
 visibility)

---
 Magento_Newsletter/templates/subscribe.phtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Magento_Newsletter/templates/subscribe.phtml b/Magento_Newsletter/templates/subscribe.phtml
index 70d15abbe..abac217db 100755
--- a/Magento_Newsletter/templates/subscribe.phtml
+++ b/Magento_Newsletter/templates/subscribe.phtml
@@ -17,7 +17,7 @@
                    type="email"
                    id="newsletter"
                    class="input__field newsletter__field"
-                   placeholder="<?= __('Enter your email address') ?>"
+                   placeholder="<?= __('Enter your email') ?>"
                    required
             />
         </div>

From c56e28dd73cc7b919a5ef005af98f7361d229cc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Mon, 25 Feb 2019 13:30:35 +0100
Subject: [PATCH 56/69] #49721 - Add product-item-info class for swatch image
 update

---
 Magento_Catalog/templates/product/list.phtml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/Magento_Catalog/templates/product/list.phtml b/Magento_Catalog/templates/product/list.phtml
index 987b72cec..bbc20ae7e 100644
--- a/Magento_Catalog/templates/product/list.phtml
+++ b/Magento_Catalog/templates/product/list.phtml
@@ -36,8 +36,8 @@ use Magento\Framework\App\Action\Action;
                 class="
                     catalog-list-item
                     catalog-list__item
-                    product-item
                     product-item-details
+                    product-item-info
                 "
             >
                 <?php $productImage = $block->getImage($_product, $imageDisplayArea) ?>
@@ -145,7 +145,11 @@ use Magento\Framework\App\Action\Action;
             <?php foreach ($_productCollection as $_product): ?>
                 <?php $productImage = $block->getImage($_product, $imageDisplayArea) ?>
                 <li
-                    class="catalog-grid-item product-item-details"
+                    class="
+                        catalog-grid-item
+                        product-item-details
+                        product-item-info
+                    "
                     data-container="product-grid"
                 >
                     <a

From 81dbb484608e6c4ca7730ca160960f74a4f2b971 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 26 Feb 2019 13:12:35 +0100
Subject: [PATCH 57/69] #50476 - Change price rendering for configurable
 products

---
 .../templates/product/price/final_price.phtml | 47 +++++++++----------
 1 file changed, 22 insertions(+), 25 deletions(-)

diff --git a/Magento_ConfigurableProduct/templates/product/price/final_price.phtml b/Magento_ConfigurableProduct/templates/product/price/final_price.phtml
index ddcfb39be..a7ef99bf0 100644
--- a/Magento_ConfigurableProduct/templates/product/price/final_price.phtml
+++ b/Magento_ConfigurableProduct/templates/product/price/final_price.phtml
@@ -6,38 +6,35 @@ $priceModel = $block->getPriceType('regular_price');
 
 /** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */
 $finalPriceModel = $block->getPriceType('final_price');
+
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 $schema = ($block->getZone() == 'item_view') ? true : false;
+$normalPrice = $block->renderAmount($finalPriceModel->getAmount(), [
+    'display_label' => __('From'),
+    'price_id'   => $block->getPriceId('product-price-' . $idSuffix),
+    'price_type' => 'finalPrice',
+    'include_container' => true,
+    'schema' => $schema
+]);
 ?>
 
-<?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
-    <span class="price__value price__value--old ">
-        <?= $block->renderAmount($priceModel->getAmount(), [
-            'display_label'     => false,
-            'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
-            'price_type'        => 'oldPrice',
-            'include_container' => true,
-            'skip_adjustments'  => true
-        ]); ?>
-    </span>
-    <span class="price__value price__value--special">
-        <?= $block->renderAmount($finalPriceModel->getAmount(), [
-            'display_label'     => false,
-            'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-            'price_type'        => 'finalPrice',
-            'include_container' => true,
-            'schema' => $schema
-        ]); ?>
-    </span>
-<?php else: ?>
-    <?= $block->renderAmount($finalPriceModel->getAmount(), [
-        'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-        'price_type'        => 'finalPrice',
+<?php if (!$block->isProductList() && $block->hasSpecialPrice()):
+    $oldPrice = $block->renderAmount($priceModel->getAmount(), [
+        'price_id' => $block->getPriceId('old-price-' . $idSuffix),
+        'price_type' => 'oldPrice',
         'include_container' => true,
-        'schema' => $schema
-    ]); ?>
+        'skip_adjustments' => true
+    ]);
+?>
+    <span class="sly-old-price price__value price__value--old">
+        <?= $oldPrice ?>
+    </span>
 <?php endif; ?>
 
+<span class="normal-price">
+    <?= $normalPrice ?>
+</span>
+
 <?php if ($block->showMinimalPrice()): ?>
     <?php if ($block->getUseLinkForAsLowAs()):?>
         <a href="<?= $block->getSaleableItem()->getProductUrl() ?>" class="minimal-price-link">

From bb348c3a76be7f9a2169719a6c063c86ef0a168f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 26 Feb 2019 14:36:57 +0100
Subject: [PATCH 58/69] #50476 - Change price rendering for simple products

---
 .../templates/product/price/final_price.phtml | 55 +++++++++++++++++++
 1 file changed, 55 insertions(+)
 create mode 100644 Magento_Catalog/templates/product/price/final_price.phtml

diff --git a/Magento_Catalog/templates/product/price/final_price.phtml b/Magento_Catalog/templates/product/price/final_price.phtml
new file mode 100644
index 000000000..2242ae11c
--- /dev/null
+++ b/Magento_Catalog/templates/product/price/final_price.phtml
@@ -0,0 +1,55 @@
+<?php
+/** @var \Magento\Catalog\Pricing\Render\FinalPriceBox $block */
+
+/** ex: \Magento\Catalog\Pricing\Price\RegularPrice */
+/** @var \Magento\Framework\Pricing\Price\PriceInterface $priceModel */
+$priceModel = $block->getPriceType('regular_price');
+
+/** ex: \Magento\Catalog\Pricing\Price\FinalPrice */
+/** @var \Magento\Framework\Pricing\Price\PriceInterface $finalPriceModel */
+$finalPriceModel = $block->getPriceType('final_price');
+
+$idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
+$schema = ($block->getZone() == 'item_view') ? true : false;
+?>
+
+<?php if ($block->hasSpecialPrice()): ?>
+    <span class="price__value price__value--old">
+        <?= $block->renderAmount($priceModel->getAmount(), [
+            'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
+            'price_type'        => 'oldPrice',
+            'include_container' => true,
+            'skip_adjustments'  => true
+        ]); ?>
+    </span>
+    <span class="price__value price__value--special">
+        <?= $block->renderAmount($finalPriceModel->getAmount(), [
+            'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
+            'price_type'        => 'finalPrice',
+            'include_container' => true,
+            'schema' => $schema
+        ]); ?>
+    </span>
+<?php else: ?>
+    <?= $block->renderAmount($finalPriceModel->getAmount(), [
+        'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
+        'price_type'        => 'finalPrice',
+        'include_container' => true,
+        'schema' => $schema
+    ]); ?>
+<?php endif; ?>
+
+<?php if ($block->showMinimalPrice()): ?>
+    <?php if ($block->getUseLinkForAsLowAs()):?>
+        <a
+            href="<?= $block->getSaleableItem()->getProductUrl() ?>"
+            class="minimal-price-link"
+        >
+            <?= $block->renderAmountMinimal() ?>
+        </a>
+    <?php else:?>
+        <span class="minimal-price-link">
+            <?= $block->renderAmountMinimal() ?>
+        </span>
+    <?php endif?>
+<?php endif; ?>

From 5e75ad4cfc7d00c05d355e476e51293b450a5f06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 26 Feb 2019 15:01:31 +0100
Subject: [PATCH 59/69] #50476 - Remove unnecessary variables, update changelog

---
 CHANGELOG.md                                  |  1 +
 .../templates/product/price/final_price.phtml | 31 +++++++++----------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07bf10729..75222885b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 ### Changed
 - Refactor filters and accessibility improvements
 - Connect footer links with module-menu
+- Price rendering for simple and configurable products
 
 ### Fixed
 - Duplicated `email` id on company users view
diff --git a/Magento_ConfigurableProduct/templates/product/price/final_price.phtml b/Magento_ConfigurableProduct/templates/product/price/final_price.phtml
index a7ef99bf0..5ffbed268 100644
--- a/Magento_ConfigurableProduct/templates/product/price/final_price.phtml
+++ b/Magento_ConfigurableProduct/templates/product/price/final_price.phtml
@@ -9,30 +9,27 @@ $finalPriceModel = $block->getPriceType('final_price');
 
 $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 $schema = ($block->getZone() == 'item_view') ? true : false;
-$normalPrice = $block->renderAmount($finalPriceModel->getAmount(), [
-    'display_label' => __('From'),
-    'price_id'   => $block->getPriceId('product-price-' . $idSuffix),
-    'price_type' => 'finalPrice',
-    'include_container' => true,
-    'schema' => $schema
-]);
 ?>
 
-<?php if (!$block->isProductList() && $block->hasSpecialPrice()):
-    $oldPrice = $block->renderAmount($priceModel->getAmount(), [
-        'price_id' => $block->getPriceId('old-price-' . $idSuffix),
-        'price_type' => 'oldPrice',
-        'include_container' => true,
-        'skip_adjustments' => true
-    ]);
-?>
+<?php if (!$block->isProductList() && $block->hasSpecialPrice()): ?>
     <span class="sly-old-price price__value price__value--old">
-        <?= $oldPrice ?>
+        <?= $block->renderAmount($priceModel->getAmount(), [
+            'price_id' => $block->getPriceId('old-price-' . $idSuffix),
+            'price_type' => 'oldPrice',
+            'include_container' => true,
+            'skip_adjustments' => true
+        ]); ?>
     </span>
 <?php endif; ?>
 
 <span class="normal-price">
-    <?= $normalPrice ?>
+    <?= $block->renderAmount($finalPriceModel->getAmount(), [
+        'display_label' => __('From'),
+        'price_id'   => $block->getPriceId('product-price-' . $idSuffix),
+        'price_type' => 'finalPrice',
+        'include_container' => true,
+        'schema' => $schema
+    ]); ?>
 </span>
 
 <?php if ($block->showMinimalPrice()): ?>

From eb74db76a507149e12ddb2d759582265be811730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Tue, 26 Feb 2019 15:58:59 +0100
Subject: [PATCH 60/69] #50476 - Formatting

---
 Magento_Catalog/templates/product/price/final_price.phtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Magento_Catalog/templates/product/price/final_price.phtml b/Magento_Catalog/templates/product/price/final_price.phtml
index 2242ae11c..cc12bfc34 100644
--- a/Magento_Catalog/templates/product/price/final_price.phtml
+++ b/Magento_Catalog/templates/product/price/final_price.phtml
@@ -40,16 +40,16 @@ $schema = ($block->getZone() == 'item_view') ? true : false;
 <?php endif; ?>
 
 <?php if ($block->showMinimalPrice()): ?>
-    <?php if ($block->getUseLinkForAsLowAs()):?>
+    <?php if ($block->getUseLinkForAsLowAs()): ?>
         <a
             href="<?= $block->getSaleableItem()->getProductUrl() ?>"
             class="minimal-price-link"
         >
             <?= $block->renderAmountMinimal() ?>
         </a>
-    <?php else:?>
+    <?php else: ?>
         <span class="minimal-price-link">
             <?= $block->renderAmountMinimal() ?>
         </span>
-    <?php endif?>
+    <?php endif ?>
 <?php endif; ?>

From e375dd25ea5b417c4cd70ab67751f8d392773326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 27 Feb 2019 16:37:25 +0100
Subject: [PATCH 61/69] #50641 - Add image-wrapper class to related product

---
 Magento_Catalog/templates/product/list/items.phtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
index 24092171d..1eb1856c1 100644
--- a/Magento_Catalog/templates/product/list/items.phtml
+++ b/Magento_Catalog/templates/product/list/items.phtml
@@ -191,7 +191,9 @@ switch ($type = $block->getType()) {
                                 href="<?= $block->getProductUrl($_item) ?>"
                                 class="catalog-grid-item__link"
                             >
-                                <?= $block->getImage($_item, $image)->toHtml() ?>
+                                <div class="catalog-grid-item__image-wrapper">
+                                    <?= $block->getImage($_item, $image)->toHtml() ?>
+                                </div>
                             </a>
 
                             <section class="catalog-grid-item__details">

From 0b127189ddf1250654654ba32423f83097295afd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 27 Feb 2019 16:42:08 +0100
Subject: [PATCH 62/69] #50641 - Update thumbnail image size in cart

---
 etc/view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/view.xml b/etc/view.xml
index 480be51ea..85a5682d6 100644
--- a/etc/view.xml
+++ b/etc/view.xml
@@ -11,8 +11,8 @@
                 <height>320</height>
             </image>
             <image id="cart_page_product_thumbnail" type="small_image">
-                <width>160</width>
-                <height>160</height>
+                <width>288</width>
+                <height>288</height>
             </image>
             <image id="category_page_grid" type="small_image">
                 <width>564</width>

From 125d80d972fa2284a0ce2a3bdbc3fc512703c83d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Wed, 27 Feb 2019 17:33:30 +0100
Subject: [PATCH 63/69] #50641 - Update changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75222885b..c818c4c69 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -18,6 +18,7 @@ All notable changes to this project will be documented in this file.
 - Swatches in catalog and product page for magento 2.3.0
 - Details dropdown in minicart
 - Price updating in configurable products
+- Related products slider in product page
 
 ## [1.1.0] - 2019-01-07
 ### Added

From 12b2ee5ef989963e1d31230909d20b478b7376ae Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Thu, 28 Feb 2019 11:44:00 +0100
Subject: [PATCH 64/69] #49294 - added downloadable product missing price

---
 .../templates/catalog/product/type.phtml      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Magento_Downloadable/templates/catalog/product/type.phtml

diff --git a/Magento_Downloadable/templates/catalog/product/type.phtml b/Magento_Downloadable/templates/catalog/product/type.phtml
new file mode 100644
index 000000000..d80427705
--- /dev/null
+++ b/Magento_Downloadable/templates/catalog/product/type.phtml
@@ -0,0 +1,26 @@
+<?php
+// @codingStandardsIgnoreFile
+?>
+
+<?php /* @var $block \Magento\Downloadable\Block\Catalog\Product\View\Type */ ?>
+<?php $_product = $block->getProduct() ?>
+
+<?php if ($block->displayProductStockStatus()): ?>
+    <?php if ($_product->getIsSalable()): ?>
+        <div
+            class="product-view__stock-status"
+            title="<?= __('Availability') ?>"
+        >
+            <?= __('In stock') ?>
+        </div>
+    <?php else: ?>
+        <div
+            class="product-view__stock-status product-view__stock-status--alert"
+            title="<?= __('Availability') ?>"
+            <?= __('Out of stock') ?>
+        </div>
+    <?php endif; ?>
+<?php endif; ?>
+
+<?= $block->getChildHtml() ?>
+

From 54fca8b75f0188365baca972facba2853e12ec84 Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Thu, 28 Feb 2019 12:38:42 +0100
Subject: [PATCH 65/69] #49294 - added missing classes, delelated label, and
 containers

---
 .../templates/product/price/final_price.phtml | 56 ++++++++++---------
 1 file changed, 31 insertions(+), 25 deletions(-)

diff --git a/Magento_Catalog/templates/product/price/final_price.phtml b/Magento_Catalog/templates/product/price/final_price.phtml
index cc12bfc34..54ee2b527 100644
--- a/Magento_Catalog/templates/product/price/final_price.phtml
+++ b/Magento_Catalog/templates/product/price/final_price.phtml
@@ -13,31 +13,37 @@ $idSuffix = $block->getIdSuffix() ? $block->getIdSuffix() : '';
 $schema = ($block->getZone() == 'item_view') ? true : false;
 ?>
 
-<?php if ($block->hasSpecialPrice()): ?>
-    <span class="price__value price__value--old">
-        <?= $block->renderAmount($priceModel->getAmount(), [
-            'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
-            'price_type'        => 'oldPrice',
-            'include_container' => true,
-            'skip_adjustments'  => true
-        ]); ?>
-    </span>
-    <span class="price__value price__value--special">
-        <?= $block->renderAmount($finalPriceModel->getAmount(), [
-            'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-            'price_type'        => 'finalPrice',
-            'include_container' => true,
-            'schema' => $schema
-        ]); ?>
-    </span>
-<?php else: ?>
-    <?= $block->renderAmount($finalPriceModel->getAmount(), [
-        'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
-        'price_type'        => 'finalPrice',
-        'include_container' => true,
-        'schema' => $schema
-    ]); ?>
-<?php endif; ?>
+<div class="price">
+    <?php if ($block->hasSpecialPrice()): ?>
+        <span class="price__value price__value--old">
+            <?= $block->renderAmount($priceModel->getAmount(), [
+                'display_label'     => false,
+                'price_id'          => $block->getPriceId('old-price-' . $idSuffix),
+                'price_type'        => 'oldPrice',
+                'include_container' => false,
+                'skip_adjustments'  => true
+            ]); ?>
+        </span>
+        <span class="price__value price__value--special">
+            <?= $block->renderAmount($finalPriceModel->getAmount(), [
+                'display_label'     => false,
+                'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
+                'price_type'        => 'finalPrice',
+                'include_container' => false,
+                'schema' => $schema
+            ]); ?>
+        </span>
+    <?php else: ?>
+        <span class="price__value">
+            <?= $block->renderAmount($finalPriceModel->getAmount(), [
+                'price_id'          => $block->getPriceId('product-price-' . $idSuffix),
+                'price_type'        => 'finalPrice',
+                'include_container' => true,
+                'schema' => $schema
+            ]); ?>
+        </span>
+    <?php endif; ?>
+</div>
 
 <?php if ($block->showMinimalPrice()): ?>
     <?php if ($block->getUseLinkForAsLowAs()): ?>

From de64161d9ef38bddd52661fd2ac3e3b3dda77e0f Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Thu, 28 Feb 2019 15:11:56 +0100
Subject: [PATCH 66/69] #49294 - added base magento2 method for proper rating
 display

---
 Magento_Review/templates/form.phtml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Magento_Review/templates/form.phtml b/Magento_Review/templates/form.phtml
index 570fbd378..7d36c839f 100644
--- a/Magento_Review/templates/form.phtml
+++ b/Magento_Review/templates/form.phtml
@@ -61,8 +61,10 @@
                             <?php $options = $_rating->getOptions(); ?>
 
                             <?php foreach ($options as $_option):
-                                $_optionValue = $block->escapeHtmlAttr($_option->getValue());
-                                $_inputId = $block->escapeHtmlAttr($_rating->getRatingCode()) . $_optionValue;
+                                $_optionValue = $block->escapeHtmlAttr($_option->getId());
+                                $_inputId =
+                                    $block->escapeHtmlAttr(str_replace(' ', '_', $_rating->getRatingCode())) . '_' .
+                                    $block->escapeHtmlAttr($_option->getValue());
                             ?>
                                 <div
                                     class="rating__rate-item"

From 396afb3c521df3cfe0909af57dc1ce8376678bb5 Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Thu, 28 Feb 2019 17:01:17 +0100
Subject: [PATCH 67/69] Code review fixes

---
 Magento_Downloadable/templates/catalog/product/type.phtml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Magento_Downloadable/templates/catalog/product/type.phtml b/Magento_Downloadable/templates/catalog/product/type.phtml
index d80427705..9df2be8a3 100644
--- a/Magento_Downloadable/templates/catalog/product/type.phtml
+++ b/Magento_Downloadable/templates/catalog/product/type.phtml
@@ -18,9 +18,8 @@
             class="product-view__stock-status product-view__stock-status--alert"
             title="<?= __('Availability') ?>"
             <?= __('Out of stock') ?>
-        </div>
+        ></div>
     <?php endif; ?>
 <?php endif; ?>
-
 <?= $block->getChildHtml() ?>
 

From 8d363d939c56e4f1e8935fb11dc10cc6d5c79493 Mon Sep 17 00:00:00 2001
From: Bartosz Dominiak <bartosz.dominiak@snow.dog>
Date: Thu, 28 Feb 2019 18:02:46 +0100
Subject: [PATCH 68/69] #49294 - added text inside div

---
 Magento_Downloadable/templates/catalog/product/type.phtml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Magento_Downloadable/templates/catalog/product/type.phtml b/Magento_Downloadable/templates/catalog/product/type.phtml
index 9df2be8a3..c08e64048 100644
--- a/Magento_Downloadable/templates/catalog/product/type.phtml
+++ b/Magento_Downloadable/templates/catalog/product/type.phtml
@@ -17,8 +17,9 @@
         <div
             class="product-view__stock-status product-view__stock-status--alert"
             title="<?= __('Availability') ?>"
+        >
             <?= __('Out of stock') ?>
-        ></div>
+        </div>
     <?php endif; ?>
 <?php endif; ?>
 <?= $block->getChildHtml() ?>

From c2ac8a246dbc3bbba4c646f4d77b26b68fc5e331 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Damian=20Fia=C5=82kiewicz?= <damian.fialkiewicz@snow.dog>
Date: Mon, 4 Mar 2019 11:06:35 +0100
Subject: [PATCH 69/69] Bump v1.2.0

---
 CHANGELOG.md  | 2 ++
 composer.json | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c818c4c69..3c593e369 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
+
+## [1.2.0] - 2019-03-04
 ### Added
 - Support for escape key in dropdown script
 - Quickorder page styles
diff --git a/composer.json b/composer.json
index 59cf51326..65cb5a237 100644
--- a/composer.json
+++ b/composer.json
@@ -6,7 +6,7 @@
     "require": {
       "magento/framework": "*",
       "snowdog/frontools": "^1.6",
-      "snowdog/module-alpaca-components": "dev-develop",
+      "snowdog/module-alpaca-components": "^1.2",
       "snowdog/module-menu": "^2.4"
     },
     "autoload": {