Merge remote-tracking branch 'origin/MAGETWO-51822' into bugs

Natalia Momotenko · Natalia Momotenko · commit 86aa3071afa6 · 2016-04-27T13:28:42.000+03:00
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
@@ -311,7 +311,6 @@
                     @_line-height: @form-field-label-asterisk__line-height,
                     @_font-style: @form-field-label-asterisk__font-style
                     );
-                    .lib-css(margin, @form-field-label-asterisk__margin);
                 }
             }
         }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_forms.less b/app/design/frontend/Magento/luma/web/css/source/_forms.less
@@ -59,7 +59,7 @@
     }
 
     .legend {
-        span {
+        > span {
             margin-right: @indent__xs;
         }
     }
@@ -141,6 +141,7 @@
             @_icon-font-text-hide: true
             );
             display: inline-block;
+            margin-top: -4px;
             vertical-align: middle;
 
             &:focus {
@@ -150,6 +151,7 @@
         }
     }
 
+    .field.date,
     .field-dob {
         .hasDatepicker {
             &:extend(.abs-field-date-input all);

Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,6 @@`
`311`	`311`	`@_line-height: @form-field-label-asterisk__line-height,`
`312`	`312`	`@_font-style: @form-field-label-asterisk__font-style`
`313`	`313`	`);`
`314`		`- .lib-css(margin, @form-field-label-asterisk__margin);`
`315`	`314`	`}`
`316`	`315`	`}`
`317`	`316`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`.legend {`
`62`		`- span {`
	`62`	`+ > span {`
`63`	`63`	`margin-right: @indent__xs;`
`64`	`64`	`}`
`65`	`65`	`}`
`@@ -141,6 +141,7 @@`
`141`	`141`	`@_icon-font-text-hide: true`
`142`	`142`	`);`
`143`	`143`	`display: inline-block;`
	`144`	`+ margin-top: -4px;`
`144`	`145`	`vertical-align: middle;`
`145`	`146`
`146`	`147`	`&:focus {`
`@@ -150,6 +151,7 @@`
`150`	`151`	`}`
`151`	`152`	`}`
`152`	`153`
	`154`	`+ .field.date,`
`153`	`155`	`.field-dob {`
`154`	`156`	`.hasDatepicker {`
`155`	`157`	`&:extend(.abs-field-date-input all);`