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

Natalia Momotenko · Natalia Momotenko · commit d49dd83f66b2 · 2015-05-18T19:37:37.000+03: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
@@ -204,13 +204,9 @@
     .product-reviews-summary .reviews-actions {
         .font-size(@font-size__base);
     }
-    .product-options-wrapper {
-        .field {
-            .note {
-                display: block;
-            }
-        }
-    }
+}
+
+.product-options-wrapper {
     .fieldset-product-options-inner {
         .legend {
             border: none;
@@ -237,10 +233,10 @@
                 }
             }
         }
-        .datetime-picker {
-            + .time-picker {
-                .css(margin-left, @indent__xs);
-            }
+    }
+    .field {
+        .note {
+            display: block;
         }
     }
 }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_forms.less b/app/design/frontend/Magento/blank/web/css/source/_forms.less
@@ -60,9 +60,15 @@ fieldset.field {
     border: 0;
     padding: 0;
 }
+
 .field {
     &.date {
         &:extend(.abs-field-date all);
+        .time-picker {
+            display: inline-block;
+            margin-top: @indent__s;
+            white-space: nowrap;
+        }
     }
 }
 
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,15 +249,9 @@
             margin-top: @form-field__vertical-indent;
         }
     }
-    .product-options-wrapper {
-        .field {
-            .note {
-                display: block;
-                .css(margin-top, @indent__xs);
-            }
-        }
+}
 
-    }
+.product-options-wrapper {
     .fieldset-product-options-inner {
         .legend {
             border: none;
@@ -284,10 +278,11 @@
                 }
             }
         }
-        .datetime-picker {
-            + .time-picker {
-                .css(margin-left, @indent__xs);
-            }
+    }
+    .field {
+        .note {
+            display: block;
+            .css(margin-top, @indent__xs);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -204,13 +204,9 @@`
`204`	`204`	`.product-reviews-summary .reviews-actions {`
`205`	`205`	`.font-size(@font-size__base);`
`206`	`206`	`}`
`207`		`- .product-options-wrapper {`
`208`		`- .field {`
`209`		`- .note {`
`210`		`- display: block;`
`211`		`- }`
`212`		`- }`
`213`		`- }`
	`207`	`+}`
	`208`	`+`
	`209`	`+.product-options-wrapper {`
`214`	`210`	`.fieldset-product-options-inner {`
`215`	`211`	`.legend {`
`216`	`212`	`border: none;`
`@@ -237,10 +233,10 @@`
`237`	`233`	`}`
`238`	`234`	`}`
`239`	`235`	`}`
`240`		`- .datetime-picker {`
`241`		`- + .time-picker {`
`242`		`- .css(margin-left, @indent__xs);`
`243`		`- }`
	`236`	`+ }`
	`237`	`+ .field {`
	`238`	`+ .note {`
	`239`	`+ display: block;`
`244`	`240`	`}`
`245`	`241`	`}`
`246`	`242`	`}`
Original file line number	Diff line number	Diff line change
`@@ -60,9 +60,15 @@ fieldset.field {`
`60`	`60`	`border: 0;`
`61`	`61`	`padding: 0;`
`62`	`62`	`}`
	`63`	`+`
`63`	`64`	`.field {`
`64`	`65`	`&.date {`
`65`	`66`	`&:extend(.abs-field-date all);`
	`67`	`+ .time-picker {`
	`68`	`+ display: inline-block;`
	`69`	`+ margin-top: @indent__s;`
	`70`	`+ white-space: nowrap;`
	`71`	`+ }`
`66`	`72`	`}`
`67`	`73`	`}`
`68`	`74`
Original file line number	Diff line number	Diff line change
`@@ -249,15 +249,9 @@`
`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`		`- }`
	`252`	`+}`
`259`	`253`
`260`		`- }`
	`254`	`+.product-options-wrapper {`
`261`	`255`	`.fieldset-product-options-inner {`
`262`	`256`	`.legend {`
`263`	`257`	`border: none;`
`@@ -284,10 +278,11 @@`
`284`	`278`	`}`
`285`	`279`	`}`
`286`	`280`	`}`
`287`		`- .datetime-picker {`
`288`		`- + .time-picker {`
`289`		`- .css(margin-left, @indent__xs);`
`290`		`- }`
	`281`	`+ }`
	`282`	`+ .field {`
	`283`	`+ .note {`
	`284`	`+ display: block;`
	`285`	`+ .css(margin-top, @indent__xs);`
`291`	`286`	`}`
`292`	`287`	`}`
`293`	`288`	`}`