MAGETWO-25662: MAP on Catalog and Product Pages

Natalia Momotenko · Natalia Momotenko · commit 874e0191a6c1 · 2015-03-06T20:25:45.000+02:00
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
@@ -42,17 +42,11 @@
     }
 }
 
-.map-old-price {
+.map-old-price,
+.product-info-price .map-show-info {
     margin-right: @indent__s;
 }
 
-.product-info-price {
-    .map-show-info {
-        display: inline-block;
-        margin-right: @indent__s;
-    }
-}
-
 }
 
 //
@@ -62,7 +56,11 @@
     .map-popup {
         max-width: 100%; 
     }
-    .map-show-info {
+    .map-old-price,
+    .product-info-price .map-show-info {
         display: inline-block;
+        &:not(:last-child) {
+            margin-bottom: @indent__s;
+        }
     }
 }
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
@@ -49,25 +49,18 @@
         margin-bottom: @indent__s;
     }
     .actual-price {
-        font-size: @font-size__l;
         margin: 3px 0 15px;
     }
     .popup-header {
         display: none;
     }
 }
 
-.map-old-price {
+.map-old-price,
+.product-info-price .map-show-info {
     margin-right: @indent__s;
 }
 
-.product-info-price {
-    .map-show-info {
-        display: inline-block;
-        margin-right: @indent__s;
-    }
-}
-
 }
 
 //
@@ -77,4 +70,11 @@
     .map-popup {
         max-width: 100%; 
     }
+    .map-old-price,
+    .product-info-price .map-show-info {
+        display: inline-block;
+        &:not(:last-child) {
+            margin-bottom: @indent__s;
+        }
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -42,17 +42,11 @@`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`
`45`		`-.map-old-price {`
	`45`	`+.map-old-price,`
	`46`	`+.product-info-price .map-show-info {`
`46`	`47`	`margin-right: @indent__s;`
`47`	`48`	`}`
`48`	`49`
`49`		`-.product-info-price {`
`50`		`- .map-show-info {`
`51`		`- display: inline-block;`
`52`		`- margin-right: @indent__s;`
`53`		`- }`
`54`		`-}`
`55`		`-`
`56`	`50`	`}`
`57`	`51`
`58`	`52`	`//`
`@@ -62,7 +56,11 @@`
`62`	`56`	`.map-popup {`
`63`	`57`	`max-width: 100%;`
`64`	`58`	`}`
`65`		`- .map-show-info {`
	`59`	`+ .map-old-price,`
	`60`	`+ .product-info-price .map-show-info {`
`66`	`61`	`display: inline-block;`
	`62`	`+ &:not(:last-child) {`
	`63`	`+ margin-bottom: @indent__s;`
	`64`	`+ }`
`67`	`65`	`}`
`68`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,25 +49,18 @@`
`49`	`49`	`margin-bottom: @indent__s;`
`50`	`50`	`}`
`51`	`51`	`.actual-price {`
`52`		`- font-size: @font-size__l;`
`53`	`52`	`margin: 3px 0 15px;`
`54`	`53`	`}`
`55`	`54`	`.popup-header {`
`56`	`55`	`display: none;`
`57`	`56`	`}`
`58`	`57`	`}`
`59`	`58`
`60`		`-.map-old-price {`
	`59`	`+.map-old-price,`
	`60`	`+.product-info-price .map-show-info {`
`61`	`61`	`margin-right: @indent__s;`
`62`	`62`	`}`
`63`	`63`
`64`		`-.product-info-price {`
`65`		`- .map-show-info {`
`66`		`- display: inline-block;`
`67`		`- margin-right: @indent__s;`
`68`		`- }`
`69`		`-}`
`70`		`-`
`71`	`64`	`}`
`72`	`65`
`73`	`66`	`//`
`@@ -77,4 +70,11 @@`
`77`	`70`	`.map-popup {`
`78`	`71`	`max-width: 100%;`
`79`	`72`	`}`
	`73`	`+ .map-old-price,`
	`74`	`+ .product-info-price .map-show-info {`
	`75`	`+ display: inline-block;`
	`76`	`+ &:not(:last-child) {`
	`77`	`+ margin-bottom: @indent__s;`
	`78`	`+ }`
	`79`	`+ }`
`80`	`80`	`}`