Merge remote-tracking branch 'webdev/PR-4' into bugs

Oleksii Korshenko · Oleksii Korshenko · commit 6c380aa500e5 · 2015-10-30T18:00:43.000+02:00
diff --git a/app/code/Magento/Bundle/view/adminhtml/web/css/bundle-product.css b/app/code/Magento/Bundle/view/adminhtml/web/css/bundle-product.css
@@ -49,17 +49,13 @@
 .field-sku .control .sku {
     display: inline-block;
     width: 140px;
-    margin-right: 15px;
+    margin-right: 11px;
 }
 
 .field-sku .control .sku > input[type='text'] {
     width: 100%;
 }
 
-.field-sku .control .sku + .select {
-    vertical-align: middle;
-}
-
 .field-price .addon > .price {
     display: table;
     direction: rtl;
@@ -73,7 +69,6 @@
 }
 
 .field-price .addon > .price + .select {
-    width: 96px;
     float: left;
 }
 
diff --git a/app/design/frontend/Magento/blank/Magento_GiftWrapping/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_GiftWrapping/web/css/source/_module.less
@@ -200,7 +200,6 @@
         }
     }
     .gift-wrapping {
-        .lib-css(border-right, @gift-wrapping__border-width solid @gift-wrapping__border-color);
         box-sizing: border-box;
         float: left;
         padding-right: @indent__base;
diff --git a/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_LayeredNavigation/web/css/source/_module.less
@@ -29,13 +29,13 @@
     }
     .filter-options {
         margin: 0;
-        > dt {
+        .filter-options-title {
             .lib-heading(h4);
             margin: 0 0 @indent__s;
+            word-break: break-all;
         }
-        > dd {
+        .filter-options-content {
             margin: 0 0 @indent__m;
-
             .item {
                 margin-bottom: 3px;
             }
diff --git a/app/design/frontend/Magento/luma/Magento_GiftWrapping/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_GiftWrapping/web/css/source/_module.less
@@ -222,7 +222,6 @@
 
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .gift-wrapping {
-        .lib-css(border-right, @gift-wrapping__border-width solid @gift-wrapping__border-color);
         box-sizing: border-box;
         float: left;
         padding-right: @indent__base;
diff --git a/lib/web/magnifier/magnifier.js b/lib/web/magnifier/magnifier.js
@@ -142,7 +142,7 @@
             if ($(thumb).siblings('.magnify-lens').length) {
                 return false;
             }
-            var lens = $('<div class="magnify-lens" class="magnifier-loader" data-gallery-role="magnifier-zoom"></div>');
+            var lens = $('<div class="magnify-lens magnify-hidden" data-gallery-role="magnifier-zoom"></div>');
             $(thumb).parent().append(lens);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -49,17 +49,13 @@`
`49`	`49`	`.field-sku .control .sku {`
`50`	`50`	`display: inline-block;`
`51`	`51`	`width: 140px;`
`52`		`- margin-right: 15px;`
	`52`	`+ margin-right: 11px;`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`.field-sku .control .sku > input[type='text'] {`
`56`	`56`	`width: 100%;`
`57`	`57`	`}`
`58`	`58`
`59`		`-.field-sku .control .sku + .select {`
`60`		`- vertical-align: middle;`
`61`		`-}`
`62`		`-`
`63`	`59`	`.field-price .addon > .price {`
`64`	`60`	`display: table;`
`65`	`61`	`direction: rtl;`
`@@ -73,7 +69,6 @@`
`73`	`69`	`}`
`74`	`70`
`75`	`71`	`.field-price .addon > .price + .select {`
`76`		`- width: 96px;`
`77`	`72`	`float: left;`
`78`	`73`	`}`
`79`	`74`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,6 @@`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`	`.gift-wrapping {`
`203`		`- .lib-css(border-right, @gift-wrapping__border-width solid @gift-wrapping__border-color);`
`204`	`203`	`box-sizing: border-box;`
`205`	`204`	`float: left;`
`206`	`205`	`padding-right: @indent__base;`
Original file line number	Diff line number	Diff line change
`@@ -29,13 +29,13 @@`
`29`	`29`	`}`
`30`	`30`	`.filter-options {`
`31`	`31`	`margin: 0;`
`32`		`- > dt {`
	`32`	`+ .filter-options-title {`
`33`	`33`	`.lib-heading(h4);`
`34`	`34`	`margin: 0 0 @indent__s;`
	`35`	`+ word-break: break-all;`
`35`	`36`	`}`
`36`		`- > dd {`
	`37`	`+ .filter-options-content {`
`37`	`38`	`margin: 0 0 @indent__m;`
`38`		`-`
`39`	`39`	`.item {`
`40`	`40`	`margin-bottom: 3px;`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@`
`142`	`142`	`if ($(thumb).siblings('.magnify-lens').length) {`
`143`	`143`	`return false;`
`144`	`144`	`}`
`145`		`- var lens = $('<div class="magnify-lens" class="magnifier-loader" data-gallery-role="magnifier-zoom"></div>');`
	`145`	`+ var lens = $('<div class="magnify-lens magnify-hidden" data-gallery-role="magnifier-zoom"></div>');`
`146`	`146`	`$(thumb).parent().append(lens);`
`147`	`147`	`}`
`148`	`148`