Merge remote-tracking branch 'origin/MAGETWO-42533' into PR-2

Natalia Momotenko · Natalia Momotenko · commit 073fd14c410f · 2015-10-08T17:33:26.000+03:00
diff --git a/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml b/app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml
@@ -16,7 +16,7 @@ $tierPriceModel = $block->getPrice();
 $tierPrices = $tierPriceModel->getTierPriceList();
 ?>
 <?php if (count($tierPrices)) : ?>
-    <ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices tier items'); ?>">
+    <ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices-tier items'); ?>">
         <?php foreach ($tierPrices as $index => $price) : ?>
             <li class="item">
                 <?php /* @escapeNotVerified */ echo __(
diff --git a/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Bundle/web/css/source/_module.less
@@ -107,8 +107,11 @@
         p.required {
             .lib-css(color, @form-field-label-asterisk__color);
         }
-    }
 
+        .product-options-bottom {
+            clear: left;
+        }
+    }
 }
 
 //
diff --git a/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Bundle/web/css/source/_module.less
@@ -162,6 +162,12 @@
         .price {
             font-weight: @font-weight__semibold;
         }
+        .product-options-bottom {
+            border-top: 1px solid @border-color__base;
+            clear: left;
+            margin: 0 0 @indent__xl;
+            padding-top: @indent__base;
+        }
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -107,8 +107,11 @@`
`107`	`107`	`p.required {`
`108`	`108`	`.lib-css(color, @form-field-label-asterisk__color);`
`109`	`109`	`}`
`110`		`- }`
`111`	`110`
	`111`	`+ .product-options-bottom {`
	`112`	`+ clear: left;`
	`113`	`+ }`
	`114`	`+ }`
`112`	`115`	`}`
`113`	`116`
`114`	`117`	`//`
Original file line number	Diff line number	Diff line change
`@@ -162,6 +162,12 @@`
`162`	`162`	`.price {`
`163`	`163`	`font-weight: @font-weight__semibold;`
`164`	`164`	`}`
	`165`	`+ .product-options-bottom {`
	`166`	`+ border-top: 1px solid @border-color__base;`
	`167`	`+ clear: left;`
	`168`	`+ margin: 0 0 @indent__xl;`
	`169`	`+ padding-top: @indent__base;`
	`170`	`+ }`
`165`	`171`	`}`
`166`	`172`	`}`
`167`	`173`