Merge branch 'release/1.3.0'

SnowdogApps · Apr 17, 2019 · 39a2d51 · 39a2d51
2 parents ab70058 + bb25897
commit 39a2d51
Show file tree

Hide file tree

Showing 21 changed files with 75 additions and 77 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [1.3.0] - 2019-04-17
+### Changed
+- Wishlist and catalog elements for focus state
+- Catalog grid item link class name
+
+### Fixed
+- Fotorama video styles
+
 ## [1.2.0] - 2019-03-04
 ### Added
 - Support for escape key in dropdown script

diff --git a/Magento_Catalog/styles/modules/_fotorama.scss b/Magento_Catalog/styles/modules/_fotorama.scss
@@ -93,6 +93,48 @@
         }
     }
 
+    .fotorama-video-container {
+        cursor: pointer;
+
+        &.video-unplayed {
+            &:after {
+                content: '';
+                position: absolute;
+                top: 12px;
+                right: 0;
+                bottom: 0;
+                left: 0;
+                width: 100px;
+                height: 100px;
+                margin: auto;
+                opacity: 0.8;
+                background: url(../Magento_ProductVideo/img/gallery-sprite.png) bottom right;
+            }
+
+            &:hover {
+                &:after {
+                    opacity: 1;
+                }
+            }
+        }
+
+        &.fotorama__product-video--loaded {
+            .product-video {
+                display: block;
+                width: 100%;
+                height: 100%;
+            }
+        }
+
+        .product-video {
+            display: none;
+        }
+
+        .fotorama__img {
+            pointer-events: none;
+        }
+    }
+
     .fotorama__thumb-border {
         display: none;
     }

diff --git a/Magento_Catalog/templates/product/compare/sidebar.phtml b/Magento_Catalog/templates/product/compare/sidebar.phtml
@@ -32,10 +32,7 @@
             <div
                 class="divider sidebar-block__divider sidebar-block__hidden"
                 data-bind="css: { 'sidebar-block__hidden': null }"
-            >
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            ></div>
             <ol
                 id="compare-items"
                 class="list sidebar-block__list sidebar-block__list--hidden"

diff --git a/Magento_Catalog/templates/product/list.phtml b/Magento_Catalog/templates/product/list.phtml
@@ -151,11 +151,12 @@ use Magento\Framework\App\Action\Action;
                         product-item-info
                     "
                     data-container="product-grid"
+                    tabindex="0"
                 >
                     <a
                         href="<?= $block->getProductUrl($_product) ?>"
                         class="catalog-grid-item__link"
-                        title="<?= $_product['name'] ?>"
+                        tabindex="-1"
                     >
                         <div class="catalog-grid-item__image-wrapper">
                             <?= $productImage->toHtml() ?>
@@ -165,7 +166,7 @@ use Magento\Framework\App\Action\Action;
                         <div class="catalog-grid-item__name">
                             <a
                                 href="<?= $block->getProductUrl($_product) ?>"
-                                class="catalog-grid-item__link catalog-grid-item__link--name"
+                                class="catalog-grid-item__name-link"
                             >
                                 <?= $_product['name'] ?>
                             </a>

diff --git a/Magento_Catalog/templates/product/list/items.phtml b/Magento_Catalog/templates/product/list/items.phtml
@@ -200,7 +200,7 @@ switch ($type = $block->getType()) {
                                 <h2 class="catalog-grid-item__name">
                                     <a
                                         href="<?= $block->getProductUrl($_item) ?>"
-                                        class="catalog-grid-item__link catalog-grid-item__link--name"
+                                        class="catalog-grid-item__name-link"
                                         title="<?= $block->escapeHtml($_item->getName()) ?>"
                                     >
                                         <?= $block->escapeHtml($_item->getName()) ?>

diff --git a/Magento_Checkout/web/template/payment-methods/list.html b/Magento_Checkout/web/template/payment-methods/list.html
@@ -10,10 +10,7 @@
                 data-role="title"
             >
         </div>
-        <div class="divider">
-            <span class="divider__left"></span>
-            <span class="divider__right"></span>
-        </div>
+        <div class="divider"></div>
         <each args="data: getRegion($group().displayArea), as: 'method'" render=""/>
     </div>
 </div>

diff --git a/Magento_Checkout/web/template/shipping.html b/Magento_Checkout/web/template/shipping.html
@@ -8,10 +8,7 @@
         translate="'Shipping Address'"
         data-role="title"
     ></div>
-    <div class="divider">
-        <span class="divider__left"></span>
-        <span class="divider__right"></span>
-    </div>
+    <div class="divider"></div>
     <div
         id="checkout-step-shipping"
         class="step-content"
@@ -57,10 +54,7 @@
             translate="'Shipping Methods'"
             data-role="title"
         ></div>
-        <div class="divider">
-            <span class="divider__left"></span>
-            <span class="divider__right"></span>
-        </div>
+        <div class="divider"></div>
         <each args="getRegion('before-shipping-method-form')" render="" />
         <div
             id="checkout-step-shipping_method"

diff --git a/Magento_Company/templates/company/account/create.phtml b/Magento_Company/templates/company/account/create.phtml
@@ -22,10 +22,7 @@
             <h3 class="legend">
                 <?= $block->escapeHtml(__('Company Information')) ?>
             </h3>
-            <div class="divider registration__divider">
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            <div class="divider registration__divider"></div>
             <div class="input company-name _required">
                 <label class="label" for="company_name">
                     <?= $block->escapeHtml(__('Company Name')) ?>
@@ -110,10 +107,7 @@
             <h3>
                 <?= $block->escapeHtml(__('Legal Address')) ?>
             </h3>
-            <div class="divider registration__divider">
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            <div class="divider registration__divider"></div>
             <div class="input street _required">
                 <label class="label" for="street0">
                     <?= $block->escapeHtml(__('Street Address')) ?>
@@ -244,10 +238,7 @@
             <h3>
                 <?= __('Company Administrator') ?>
             </h3>
-            <div class="divider registration__divider">
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            <div class="divider registration__divider"></div>
             <div class="input legal-name">
                 <label class="label" for="job_title">
                     <?= $block->escapeHtml(__('Job Title')) ?>

diff --git a/Magento_Company/templates/company/account/create_link.phtml b/Magento_Company/templates/company/account/create_link.phtml
@@ -5,10 +5,7 @@
         <h3>
             <?= __('New Company Account') ?>
         </h3>
-        <div class="divider">
-            <span class="divider__left"></span>
-            <span class="divider__right"></span>
-        </div>
+        <div class="divider"></div>
         <div class="block-content" aria-labelledby="block-new-company-heading">
             <p class="login__info">
                 <?= __(

diff --git a/Magento_Customer/templates/form/login.phtml b/Magento_Customer/templates/form/login.phtml
@@ -10,10 +10,7 @@
     <h3>
         <?= __('Registered Customers') ?>
     </h3>
-    <div class="divider">
-        <span class="divider__left"></span>
-        <span class="divider__right"></span>
-    </div>
+    <div class="divider"></div>
     <p class="login__info">
         <?= __('If you have an account, sign in with your email address.') ?>
     </p>

diff --git a/Magento_Customer/templates/form/register.phtml b/Magento_Customer/templates/form/register.phtml
@@ -15,10 +15,7 @@
             <legend class="form__legend fieldset__legend registration__legend">
                 <?= __('Personal Information') ?>
             </legend>
-            <div class="divider registration__divider">
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            <div class="divider registration__divider"></div>
             <input
                 type="hidden"
                 name="success_url"
@@ -90,10 +87,7 @@
             <legend class="form__legend fieldset__legend registration__legend">
                 <?= __('Sign-in Information') ?>
             </legend>
-            <div class="divider registration__divider">
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            <div class="divider registration__divider"></div>
             <div class="input registration__input required">
                 <label for="email_address" class="input__label">
                     <?= __('Email') ?>

diff --git a/Magento_Customer/templates/newcustomer.phtml b/Magento_Customer/templates/newcustomer.phtml
@@ -10,10 +10,7 @@
         <h3>
             <?= __('New Customers') ?>
         </h3>
-        <div class="divider">
-            <span class="divider__left"></span>
-            <span class="divider__right"></span>
-        </div>
+        <div class="divider"></div>
         <p class="login__info">
             <?= __('Creating an account has many benefits: check out faster, keep more than one address, track orders and more.') ?>
         </p>

diff --git a/Magento_LayeredNavigation/templates/layer/state.phtml b/Magento_LayeredNavigation/templates/layer/state.phtml
@@ -10,10 +10,7 @@
     <h2 class="filters__heading">
         <?= __('Now Shopping by') ?>
     </h2>
-    <div class="divider filters__divider">
-        <span class="divider__left"></span>
-        <span class="divider__right"></span>
-    </div>
+    <div class="divider filters__divider"></div>
     <div class="filters__active">
         <ul class="active-filters list">
             <?php foreach ($_filters as $_filter): ?>

diff --git a/Magento_LayeredNavigation/templates/layer/view.phtml b/Magento_LayeredNavigation/templates/layer/view.phtml
@@ -33,10 +33,7 @@
             <h2 class="filters__heading filters__heading--mobile-hidden">
                 <?= __('Shopping Options') ?>
             </h2>
-            <div class="divider filters__divider">
-                <span class="divider__left"></span>
-                <span class="divider__right"></span>
-            </div>
+            <div class="divider filters__divider"></div>
             <ul class="dropdown-list__list">
                 <?php foreach ($block->getFilters() as $filter): ?>
                     <?php if ($filter->getItemsCount()): ?>

diff --git a/Magento_Sales/templates/reorder/sidebar.phtml b/Magento_Sales/templates/reorder/sidebar.phtml
@@ -9,10 +9,7 @@
                 <?= __('Recently Ordered') ?>
             </h2>
         </div>
-        <div class="divider sidebar-block__divider">
-            <span class="divider__left"></span>
-            <span class="divider__right"></span>
-        </div>
+        <div class="divider sidebar-block__divider"></div>
         <form
             id="reorder-validate-detail"
             method="post"

diff --git a/Magento_Wishlist/templates/item/column/image.phtml b/Magento_Wishlist/templates/item/column/image.phtml
@@ -6,6 +6,7 @@
 <a
     href="<?= $block->getProductUrl($item) ?>"
     title="<?= $block->escapeHtml($product->getName()) ?>"
+    class="wishlist__link"
 >
     <?= $block->getImage($product, 'wishlist_thumbnail')->toHtml(); ?>
 </a>
diff --git a/Magento_Wishlist/templates/sidebar.phtml b/Magento_Wishlist/templates/sidebar.phtml
@@ -30,10 +30,7 @@ $wishlistHelper = $this->helper('Magento\Wishlist\Helper\Data');
                 <div
                     class="divider sidebar-block__divider sidebar-block__hidden"
                     data-bind="css: { 'sidebar-block__hidden': null }"
-                >
-                    <span class="divider__left"></span>
-                    <span class="divider__right"></span>
-                </div>
+                ></div>
                 <ol
                     class="list sidebar-block__list sidebar-block__list--hidden"
                     id="wishlist-sidebar"

diff --git a/Snowdog_SolrNavigation/templates/filters.phtml b/Snowdog_SolrNavigation/templates/filters.phtml
@@ -13,10 +13,7 @@ $filters = $block->getFilterBlocks();
     <h2 class="filters__heading">
         <?= __('Now Shopping by') ?>
     </h2>
-    <div class="divider filters__divider">
-        <span class="divider__left"></span>
-        <span class="divider__right"></span>
-    </div>
+    <div class="divider filters__divider"></div>
     <div class="filters__active">
         <ul class="active-filters list">
             <?php foreach ($filters as $filterBlock): ?>

diff --git a/Snowdog_SolrNavigation/templates/grid.phtml b/Snowdog_SolrNavigation/templates/grid.phtml
@@ -46,7 +46,7 @@ $solrDataHelper = $this->helper('Snowdog\SolrNavigation\Helper\Data');
                         >
                             <a
                                 href="<?= $block->getProductUrl($_product) ?>"
-                                class="catalog-grid-item__link catalog-grid-item__link--name"
+                                class="catalog-grid-item__name-link"
                                 title="<?= $_product['name'] ?>"
                             >
                                 <?= $_product['name'] ?>

diff --git a/Snowdog_SolrNavigation/templates/navigation.phtml b/Snowdog_SolrNavigation/templates/navigation.phtml
@@ -28,10 +28,7 @@ $facets = $this->getFacets();
         <h2 class="filters__heading filters__heading--mobile-hidden">
             <?= __('Shopping Options') ?>
         </h2>
-        <div class="divider filters__divider">
-            <span class="divider__left"></span>
-            <span class="divider__right"></span>
-        </div>
+        <div class="divider filters__divider"></div>
         <ul class="dropdown-list__list">
             <?php foreach ($facets as $attributeCode => $facetBlock): ?>
                 <?= $facetBlock->toHtml() ?>

diff --git a/composer.json b/composer.json
@@ -6,7 +6,7 @@
     "require": {
       "magento/framework": "*",
       "snowdog/frontools": "^1.6",
-      "snowdog/module-alpaca-components": "^1.2",
+      "snowdog/module-alpaca-components": "~1.3.0",
       "snowdog/module-menu": "^2.4"
     },
     "autoload": {