MAGETWO-46052: Wish Lists UI issues

- Merge remote-tracking branch 'origin/MAGETWO-46052-new' into PR - Conflicts: - app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
magento · Dec 3, 2015 · 00e4628 · 00e4628
2 parents 88351ba + eefb9cb
commit 00e4628
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 198 deletions.
diff --git a/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_MultipleWishlist/web/css/source/_module.less
@@ -30,21 +30,21 @@
             @_dropdown-split-list-min-width: 200px
             );
             vertical-align: middle;
+            &:extend(.abs-dropdown-items-new all);
 
             .items {
                 text-align: left;
-            }
-
-            .items .item:last-child {
-                background: @color-gray-darken1;
+                .item {
+                    &:last-child {
+                        background: @color-gray-darken1;
 
-                &:hover {
-                    .lib-css(background, @dropdown-list-item__hover);
+                        &:hover {
+                            .lib-css(background, @dropdown-list-item__hover);
+                        }
+                    }
                 }
             }
 
-            &:extend(.abs-dropdown-items-new all);
-
             .table-comparison &,
             .product-items & {
                 > .action {
@@ -93,9 +93,6 @@
                 margin-bottom: @indent__s;
 
                 > .action {
-                    &.split {
-                    }
-
                     &.toggle {
                         padding: 4px @indent__xs;
                     }
@@ -134,22 +131,13 @@
                         font-weight: @font-weight__semibold;
                         &:extend(.abs-colon all);
                     }
-
-                    &-current {
-                    }
                 }
+
                 &-items {
                     &:extend(.abs-reset-list all);
-
-                    &.active {
-                    }
                 }
             }
 
-            &-add.item {
-                .action {
-                }
-            }
             //  Wish list name
             &-title {
                 margin-bottom: @indent__s;
@@ -158,21 +146,12 @@
                     font-weight: @font-weight__light;
                     margin-right: @indent__s;
                 }
-
-                .action.edit {
-                }
-            }
-            //  Wish list info
-            &-info {
             }
 
             &-notice {
                 .lib-css(color, @text__color__muted);
                 display: inline-block;
                 margin-right: @indent__base;
-
-                &.private {
-                }
             }
 
             //  Wish list toolbar
@@ -185,9 +164,6 @@
                 &-select {
                     margin-right: @indent__base;
                 }
-
-                &-actions {
-                }
             }
             //  Wish list toolbar actions
             &-dropdown.move {
@@ -299,12 +275,6 @@
 
                 .wishlist-name {
                     &:extend(.abs-toggling-title-mobile all);
-
-                    &-label {
-                    }
-
-                    &-current {
-                    }
                 }
 
                 &-items {
@@ -352,36 +322,19 @@
                 strong {
                     .lib-font-size(26);
                 }
-                .action.edit {
-                }
             }
 
             //  Wish list info
             &-info {
                 margin-bottom: 15px;
             }
 
-            &-notice {
-                &.private {
-                }
-            }
-
             //  Wish list toolbar
             &-toolbar {
                 &-select,
                 &-actions {
                     margin-bottom: 15px;
                 }
-
-                &-select {
-                }
-
-                &-actions {
-                }
-            }
-
-            //  Wish list toolbar actions
-            &-dropdown.move {
             }
         }
     }
@@ -460,28 +413,13 @@
                     vertical-align: top;
                     white-space: nowrap;
                     width: 5%;
-
-                    span {
-                    }
-
-                    &.active {
-                    }
-
-                    &-label {
-                    }
-
-                    &-current {
-                    }
                 }
 
                 &-items {
                     display: table-cell;
                     padding-right: 160px;
                     vertical-align: top;
 
-                    &.active {
-                    }
-
                     .item {
                         display: inline-block;
                         margin-right: @indent__s;
@@ -514,38 +452,16 @@
                 strong {
                     .lib-font-size(40);
                 }
-
-                .action.edit {
-                }
             }
 
             //  Wish list info
             &-info {
                 float: left;
             }
 
-            &-notice {
-                &.private {
-                }
-            }
-
             //  Wish list toolbar
             &-toolbar {
                 float: right;
-
-                &-select,
-                &-actions {
-                }
-
-                &-select {
-                }
-
-                &-actions {
-                }
-            }
-
-            //  Wish list toolbar actions
-            &-dropdown.move {
             }
         }
     }

diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/module/_listings.less
@@ -17,6 +17,9 @@
 @product-name-link__text-decoration__hover: @link__hover__text-decoration;
 @product-name-link__text-decoration__visited: @link__hover__text-decoration;
 
+@product-item__hover__background-color: @color-white;
+@product-item__hover__box-shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
+
 //
 
 //
@@ -250,10 +253,8 @@
         .products-grid & {
             &:hover,
             &.active {
-                @_shadow: 3px 3px 4px 0 rgba(0, 0, 0, .3);
-
-                .lib-css(background, @color-white);
-                .lib-css(box-shadow, @_shadow);
+                .lib-css(background, @product-item__hover__background-color);
+                .lib-css(box-shadow, @product-item__hover__box-shadow);
                 border: 1px solid @color-gray-light2;
                 margin: -10px;
                 padding: 9px;
@@ -269,15 +270,13 @@
 
     .product-item-inner {
         .products-grid & {
-            @_shadow: 3px 4px 4px 0 rgba(0, 0, 0, .3);
-
-            .lib-css(background, @color-white);
-            .lib-css(box-shadow, @_shadow);
+            .lib-css(background, @product-item__hover__background-color);
+            .lib-css(box-shadow, @product-item__hover__box-shadow);
             border: 1px solid @color-gray-light2;
             border-top: none;
             left: 0;
             margin: 9px 0 0 -1px;
-            padding: 0 9px 9px 9px;
+            padding: 0 9px 9px;
             position: absolute;
             right: -1px;
             z-index: 2;
@@ -304,12 +303,34 @@
                 }
             }
         }
-        
+
         .actions-primary {
             display: table-cell;
         }
     }
 
+    .page-products {
+        .products-grid {
+            .product-item-inner {
+                &:before {
+                    .lib-css(background, @product-item__hover__background-color);
+                    content: '';
+                    height: 3px;
+                    left: 0;
+                    position: absolute;
+                    top: -2px;
+                    width: 100%;
+                    z-index: 1;
+                }
+            }
+        }
+
+        .product-item-actions {
+            position: relative;
+            z-index: 2;
+        }
+    }
+
     .products-grid {
         .product-item-info {
             &:not(:hover) {