Merge branch 'MAGETWO-25662' of github.corp.ebay.com:magento-webdev/magento2ce into MAGETWO-25662

guz-anton · guz-anton · commit 32f07b20f989 · 2015-03-05T13:39:32.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
@@ -13,7 +13,7 @@
     &.popup {
         .action {
             &.close {
-                .css(top, @popup-button-close__position-top + @indent__s);
+                .css(top, @popup-button-close__position-top);
             }
         }
     }
diff --git a/app/design/frontend/Magento/blank/web/css/source/_popups.less b/app/design/frontend/Magento/blank/web/css/source/_popups.less
@@ -16,9 +16,11 @@
     &.popup {
         .action {
             &.close {
+                width: 40px;
+                height: 40px;
+                top: 0;
+                right: 0;
                 .css(position, @popup-button-close__position);
-                .css(top, @popup-button-close__position-top);
-                .css(right, @popup-button-close__position-right);
                 .css(bottom, @popup-button-close__position-bottom);
                 .css(left, @popup-button-close__position-left);
                 z-index: 1001;
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
@@ -13,7 +13,7 @@
     &.popup {
         .action {
             &.close {
-                .css(top, @popup-button-close__position-top + @indent__s);
+                .css(top, @popup-button-close__position-top);
             }
         }
     }
diff --git a/app/design/frontend/Magento/luma/web/css/source/_popups.less b/app/design/frontend/Magento/luma/web/css/source/_popups.less
@@ -16,9 +16,11 @@
     &.popup {
         .action {
             &.close {
+                width: 40px;
+                height: 40px;
+                top: 0;
+                right: 0;
                 .css(position, @popup-button-close__position);
-                .css(top, @popup-button-close__position-top);
-                .css(right, @popup-button-close__position-right);
                 .css(bottom, @popup-button-close__position-bottom);
                 .css(left, @popup-button-close__position-left);
                 z-index: 1001;

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`&.popup {`
`14`	`14`	`.action {`
`15`	`15`	`&.close {`
`16`		`- .css(top, @popup-button-close__position-top + @indent__s);`
	`16`	`+ .css(top, @popup-button-close__position-top);`
`17`	`17`	`}`
`18`	`18`	`}`
`19`	`19`	`}`