MAGETWO-25662: MAP on Catalog and Product Pages

Natalia Momotenko · Natalia Momotenko · commit deeb332c5f29 · 2015-03-11T15:32:19.000+02:00
diff --git a/app/code/Magento/Msrp/view/frontend/templates/popup.phtml b/app/code/Magento/Msrp/view/frontend/templates/popup.phtml
@@ -20,7 +20,7 @@
                 <div class="price-box">
                     <div class="map-msrp" id="map-popup-msrp-box">
                         <span class="label"><?php echo __('Price'); ?></span>
-                        <span class="old-price" id="map-popup-msrp">
+                        <span class="old-price map-old-price" id="map-popup-msrp">
                             <span class="price"></span>
                         </span>
                     </div>
diff --git a/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Catalog/web/css/source/_module.less
@@ -329,7 +329,6 @@
         }
         .price-box {
             display: block;
-            font-weight: @font-weight__semibold;
             margin: 7px 0;
         }
         .text {
diff --git a/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/blank/Magento_Msrp/web/css/source/_module.less
@@ -44,7 +44,9 @@
 
 .map-old-price,
 .product-info-price .map-show-info {
-    margin-right: @indent__s;
+    &:not(:last-child) {
+        margin-right: @indent__s;
+    }
 }
 
 }
@@ -57,7 +59,7 @@
         max-width: 100%; 
     }
     .map-old-price,
-    .product-info-price .map-show-info {
+    .map-show-info {
         display: inline-block;
         &:not(:last-child) {
             margin-bottom: @indent__s;
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
@@ -385,7 +385,6 @@
         }
         .price-box {
             display: block;
-            font-weight: @font-weight__semibold;
             margin: 7px 0;
         }
         .text {
diff --git a/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less b/app/design/frontend/Magento/luma/Magento_Msrp/web/css/source/_module.less
@@ -56,9 +56,25 @@
     }
 }
 
+.map-old-price {
+    text-decoration: line-through;
+}
+
 .map-old-price,
+.product-item .map-old-price,
 .product-info-price .map-show-info {
-    margin-right: @indent__s;
+    &:not(:last-child) {
+        margin-right: @indent__s;
+    }
+}
+
+.product-options-bottom .price-box,
+.product-info-price .price-box {
+    .old-price {
+        .price-container > span {
+            display: inline;
+        }
+    }
 }
 
 }
@@ -71,7 +87,7 @@
         max-width: 100%; 
     }
     .map-old-price,
-    .product-info-price .map-show-info {
+    .map-show-info {
         display: inline-block;
         &:not(:last-child) {
             margin-bottom: @indent__s;

Original file line number	Diff line number	Diff line change
`@@ -329,7 +329,6 @@`
`329`	`329`	`}`
`330`	`330`	`.price-box {`
`331`	`331`	`display: block;`
`332`		`- font-weight: @font-weight__semibold;`
`333`	`332`	`margin: 7px 0;`
`334`	`333`	`}`
`335`	`334`	`.text {`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,9 @@`
`44`	`44`
`45`	`45`	`.map-old-price,`
`46`	`46`	`.product-info-price .map-show-info {`
`47`		`- margin-right: @indent__s;`
	`47`	`+ &:not(:last-child) {`
	`48`	`+ margin-right: @indent__s;`
	`49`	`+ }`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`}`
`@@ -57,7 +59,7 @@`
`57`	`59`	`max-width: 100%;`
`58`	`60`	`}`
`59`	`61`	`.map-old-price,`
`60`		`- .product-info-price .map-show-info {`
	`62`	`+ .map-show-info {`
`61`	`63`	`display: inline-block;`
`62`	`64`	`&:not(:last-child) {`
`63`	`65`	`margin-bottom: @indent__s;`
Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,6 @@`
`385`	`385`	`}`
`386`	`386`	`.price-box {`
`387`	`387`	`display: block;`
`388`		`- font-weight: @font-weight__semibold;`
`389`	`388`	`margin: 7px 0;`
`390`	`389`	`}`
`391`	`390`	`.text {`