Merge branch 'develop' into pr

mlogvin · mlogvin · commit 8018a85da595 · 2016-06-07T11:04:58.000+03:00
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_collapsible-blocks.less
@@ -412,6 +412,7 @@
 
             span {
                 &[data-config-scope] {
+                    display: inline-block;
                     position: relative;
 
                     &:before {
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -1174,7 +1174,7 @@
 & when (@media-common = true) {
     .abs-field-date-input {
         .lib-css(margin-right, @indent__s);
-        width: calc(~'100% - (@{icon-calendar__font-size} + @{indent__s})');
+        width: calc(~'100% -' @icon-calendar__font-size + @indent__s);
     }
 }
 
@@ -1189,7 +1189,7 @@
 
         input {
             .lib-css(margin-right, @indent__s);
-            width: calc(~'100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})');
+            width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs);
         }
     }
 }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1615,7 +1615,7 @@
 & when (@media-common = true) {
     .abs-field-date-input {
         .lib-css(margin-right, @indent__s);
-        width: calc(~'100% - (@{icon-calendar__font-size} + @{indent__s})');
+        width: calc(~'100% -' @icon-calendar__font-size + @indent__s);
     }
 }
 
@@ -1630,7 +1630,7 @@
 
         input {
             .lib-css(margin-right, @indent__s);
-            width: calc(~'100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})');
+            width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs);
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -1174,7 +1174,7 @@`
`1174`	`1174`	`& when (@media-common = true) {`
`1175`	`1175`	`.abs-field-date-input {`
`1176`	`1176`	`.lib-css(margin-right, @indent__s);`
`1177`		`- width: calc(~'100% - (@{icon-calendar__font-size} + @{indent__s})');`
	`1177`	`+ width: calc(~'100% -' @icon-calendar__font-size + @indent__s);`
`1178`	`1178`	`}`
`1179`	`1179`	`}`
`1180`	`1180`
`@@ -1189,7 +1189,7 @@`
`1189`	`1189`
`1190`	`1190`	`input {`
`1191`	`1191`	`.lib-css(margin-right, @indent__s);`
`1192`		`- width: calc(~'100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})');`
	`1192`	`+ width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs);`
`1193`	`1193`	`}`
`1194`	`1194`	`}`
`1195`	`1195`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1615,7 +1615,7 @@`
`1615`	`1615`	`& when (@media-common = true) {`
`1616`	`1616`	`.abs-field-date-input {`
`1617`	`1617`	`.lib-css(margin-right, @indent__s);`
`1618`		`- width: calc(~'100% - (@{icon-calendar__font-size} + @{indent__s})');`
	`1618`	`+ width: calc(~'100% -' @icon-calendar__font-size + @indent__s);`
`1619`	`1619`	`}`
`1620`	`1620`	`}`
`1621`	`1621`
`@@ -1630,7 +1630,7 @@`
`1630`	`1630`
`1631`	`1631`	`input {`
`1632`	`1632`	`.lib-css(margin-right, @indent__s);`
`1633`		`- width: calc(~'100% - (@{checkout-tooltip-icon__font-size} + @{indent__s} + @{indent__xs})');`
	`1633`	`+ width: calc(~'100% -' @checkout-tooltip-icon__font-size + @indent__s + @indent__xs);`
`1634`	`1634`	`}`
`1635`	`1635`	`}`
`1636`	`1636`	`}`