Merge remote-tracking branch 'origin/MAGETWO-34550' into UI

Natalia Momotenko · Natalia Momotenko · commit 8306fcee6f1c · 2015-03-15T11:22:22.000+02:00
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -210,6 +210,13 @@
     .product-reviews-summary .reviews-actions {
         .font-size(@font-size__base);
     }
+    .product-options-wrapper {
+        .field {
+            .note {
+                display: block;
+            }
+        }
+    }
 }
 
 .product-info-main,
diff --git a/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less
@@ -249,6 +249,14 @@
             margin-top: @form-field__vertical-indent;
         }
     }
+    .product-options-wrapper {
+        .field {
+            .note {
+                display: block;
+                .css(margin-top, @indent__xs);
+            }
+        }
+    }
 }
 
 .product-options-bottom .price-box,

Original file line number	Diff line number	Diff line change
`@@ -210,6 +210,13 @@`
`210`	`210`	`.product-reviews-summary .reviews-actions {`
`211`	`211`	`.font-size(@font-size__base);`
`212`	`212`	`}`
	`213`	`+ .product-options-wrapper {`
	`214`	`+ .field {`
	`215`	`+ .note {`
	`216`	`+ display: block;`
	`217`	`+ }`
	`218`	`+ }`
	`219`	`+ }`
`213`	`220`	`}`
`214`	`221`
`215`	`222`	`.product-info-main,`
Original file line number	Diff line number	Diff line change
`@@ -249,6 +249,14 @@`
`249`	`249`	`margin-top: @form-field__vertical-indent;`
`250`	`250`	`}`
`251`	`251`	`}`
	`252`	`+ .product-options-wrapper {`
	`253`	`+ .field {`
	`254`	`+ .note {`
	`255`	`+ display: block;`
	`256`	`+ .css(margin-top, @indent__xs);`
	`257`	`+ }`
	`258`	`+ }`
	`259`	`+ }`
`252`	`260`	`}`
`253`	`261`
`254`	`262`	`.product-options-bottom .price-box,`