Merge remote-tracking branch 'origin/MAGETWO-44610' into PR-4

Natalia Momotenko · Natalia Momotenko · commit f0cb7a547a1f · 2015-10-29T19:48:53.000+02:00
diff --git a/app/design/frontend/Magento/blank/web/css/source/_extends.less b/app/design/frontend/Magento/blank/web/css/source/_extends.less
@@ -1128,6 +1128,7 @@
     .amount {
         padding-right: 4px;
         text-align: right;
+        white-space: nowrap;
         strong {
             font-weight: @font-weight__regular;
         }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_extends.less b/app/design/frontend/Magento/luma/web/css/source/_extends.less
@@ -1519,6 +1519,7 @@
             font-weight: @font-weight__regular;
             padding: 6px 0 6px 14px;
             text-align: right;
+            white-space: nowrap;
         }
     }
     .table-caption {

Original file line number	Diff line number	Diff line change
`@@ -1128,6 +1128,7 @@`
`1128`	`1128`	`.amount {`
`1129`	`1129`	`padding-right: 4px;`
`1130`	`1130`	`text-align: right;`
	`1131`	`+ white-space: nowrap;`
`1131`	`1132`	`strong {`
`1132`	`1133`	`font-weight: @font-weight__regular;`
`1133`	`1134`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1519,6 +1519,7 @@`
`1519`	`1519`	`font-weight: @font-weight__regular;`
`1520`	`1520`	`padding: 6px 0 6px 14px;`
`1521`	`1521`	`text-align: right;`
	`1522`	`+ white-space: nowrap;`
`1522`	`1523`	`}`
`1523`	`1524`	`}`
`1524`	`1525`	`.table-caption {`