Merge branch 'MAGETWO-70329' into 2.1.13-PR-0.5

Author: dhorytskyi

app/code/Magento/Catalog/view/base/templates/product/price/amount/default.phtml

@@ -19,10 +19,14 @@
         <?php echo($block->getPriceDisplayLabel()) ? 'data-label="' . $block->getPriceDisplayLabel() . $block->getPriceDisplayInclExclTaxes() . '"' : '' ?>
         data-price-amount="<?php /* @escapeNotVerified */ echo $block->getDisplayValue(); ?>"
         data-price-type="<?php /* @escapeNotVerified */ echo $block->getPriceType(); ?>"
-        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>"
-        <?php echo $block->getSchema() ? ' itemprop="price"' : '' ?>>
-        <?php /* @escapeNotVerified */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
+        class="price-wrapper <?php /* @escapeNotVerified */ echo $block->getPriceWrapperCss(); ?>">
+        <?php /* @noEscape */ echo $block->formatCurrency($block->getDisplayValue(), (bool)$block->getIncludeContainer()) ?>
     </span>
+    <?php if ($block->getSchema()): ?>
+        <span class="_hidden" itemprop="price">
+            <?php /* @noEscape */ echo $block->getDisplayValue()  ?>
+        </span>
+    <?php endif; ?>
     <?php if ($block->hasAdjustmentsHtml()): ?>
         <?php echo $block->getAdjustmentsHtml() ?>
     <?php endif; ?>

app/design/frontend/Magento/luma/Magento_Catalog/web/css/source/_module.less

@@ -189,6 +189,10 @@
                         &:last-child {
                             margin-bottom: 0;
                         }
+
+                        &._hidden {
+                            display: none;
+                        }
                     }
                 }
             }