Merge remote-tracking branch 'origin/MAGETWO-37890' into PR

Natalia Momotenko · Natalia Momotenko · commit d9639d1e3def · 2015-06-15T17:44:43.000+03:00
diff --git a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/_module.less
@@ -94,6 +94,16 @@
             }
         }
     }
+    .nested {
+        .field.qty {
+            .label {
+                .css(font-weight, @form-field-label__font-weight);
+                .css(margin, 0 0 @indent__xs);
+                display: inline-block;
+            }
+            .css(margin-top, @form-field__vertical-indent);
+        }
+    }
     p.required {
         .css(color, @form-field-label-asterisk__color);
     }
@@ -109,7 +119,8 @@
         .legend.title {
             &:extend(.abs-reset-left-margin all);
         }
-        .bundle-options-wrapper {
+        .bundle-options-wrapper,
+        .product-options-wrapper {
             float: left;
             width: 57%;
         }
diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -176,7 +176,8 @@
         .legend.title {
             font-size: @h1__font-size-desktop;
         }
-        .bundle-options-wrapper {
+        .bundle-options-wrapper,
+        .product-options-wrapper {
             float: left;
             width: 57%;
         }

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,16 @@`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`}`
	`97`	`+ .nested {`
	`98`	`+ .field.qty {`
	`99`	`+ .label {`
	`100`	`+ .css(font-weight, @form-field-label__font-weight);`
	`101`	`+ .css(margin, 0 0 @indent__xs);`
	`102`	`+ display: inline-block;`
	`103`	`+ }`
	`104`	`+ .css(margin-top, @form-field__vertical-indent);`
	`105`	`+ }`
	`106`	`+ }`
`97`	`107`	`p.required {`
`98`	`108`	`.css(color, @form-field-label-asterisk__color);`
`99`	`109`	`}`
`@@ -109,7 +119,8 @@`
`109`	`119`	`.legend.title {`
`110`	`120`	`&:extend(.abs-reset-left-margin all);`
`111`	`121`	`}`
`112`		`- .bundle-options-wrapper {`
	`122`	`+ .bundle-options-wrapper,`
	`123`	`+ .product-options-wrapper {`
`113`	`124`	`float: left;`
`114`	`125`	`width: 57%;`
`115`	`126`	`}`