Merge branch 'admin-styles-migration' of github.corp.ebay.com:magento-webdev/magento2ce into MAGETWO-34476

Mykhailo Miroshnikov · Mykhailo Miroshnikov · commit 9f02737c45f2 · 2015-03-11T14:35:21.000+02:00
diff --git a/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml b/app/code/Magento/Widget/view/adminhtml/layout/adminhtml_widget_instance_edit.xml
@@ -9,7 +9,6 @@
     <head>
         <link src="prototype/window.js"/>
         <css src="prototype/windows/themes/default.css"/>
-        <css src="Magento_Theme::prototype/magento.css"/>
     </head>
     <body>
         <referenceContainer name="content">
diff --git a/app/design/adminhtml/Magento/backend/web/css/override.less b/app/design/adminhtml/Magento/backend/web/css/override.less
@@ -1983,8 +1983,6 @@ body {
 .page-wrapper {
   background-color: #ffffff;
   padding-left: 8.8rem;
-  position: relative;
-  z-index: 1;
 }
 .page-content {
   padding-left: 3rem;
@@ -2564,7 +2562,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
 }
 .ui-dialog .main-col .breadcrumbs li:after,
 .ui-dialog .magento_message .breadcrumbs li:after {
-  content: "";
+  content: '';
   margin: 0 0.5rem 0 0;
 }
 .ui-dialog .main-col #contents-uploader,
@@ -2669,6 +2667,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
 }
 .popup-window {
   background: #ffffff;
+  z-index: 1010 !important;
 }
 .popup-window .table_window > tbody > tr > td {
   background: #ffffff;
@@ -2691,7 +2690,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {
   margin: 0 0 0 3rem;
 }
 .overlay_magento {
-  z-index: 1000;
+  z-index: 800 !important;
 }
 .fade {
   z-index: 1000;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/_popups.less
@@ -392,6 +392,9 @@
 
 .popup-window {
     background: @popup__background-color;
+    &.dialog {
+        z-index: 1010 !important;
+    }
 
     .table_window > tbody > tr > td {
         background: @popup__background-color;
@@ -435,7 +438,7 @@
 
 .overlay_magento {
     &:extend(.ui-widget-overlay all);
-    z-index: 1000;
+    z-index: 800 !important;
 }
 
 //
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_structure.less b/app/design/adminhtml/Magento/backend/web/css/source/_structure.less
@@ -29,8 +29,6 @@ body {
 .page-wrapper {
     background-color: @page-wrapper__background-color;
     padding-left: @page-wrapper__indent-left;
-    position: relative;
-    z-index: @page-wrapper__z-index__base; // Base z-index for page wrapper to prevent inner page element overlap with pop-ups
 }
 
 .page-content {
diff --git a/lib/web/mage/adminhtml/wysiwyg/widget.js b/lib/web/mage/adminhtml/wysiwyg/widget.js
@@ -380,12 +380,19 @@ define([
                 title:      this.config.buttons.open,
                 modal:      true,
                 resizable:  false,
-                zIndex:     widgetTools.getMaxZIndex(),
                 width:      '75%',
                 dialogClass: 'popup-window',
+                position: {
+                    my: 'left top',
+                    at: 'center top',
+                    of: 'body'
+                },
                 open: function () {
                     jQuery(this).closest('.ui-dialog').addClass('ui-dialog-active');
                     jQuery(this).addClass('magento_message');
+
+                    var topMargin = jQuery(this).closest('.ui-dialog').children('.ui-dialog-titlebar').outerHeight() - 30;
+                    jQuery(this).closest('.ui-dialog').css('margin-top', topMargin);
                 },
                 close: function(event, ui) {
                     jQuery(this).closest('.ui-dialog').removeClass('ui-dialog-active');

Original file line number	Diff line number	Diff line change
`@@ -1983,8 +1983,6 @@ body {`
`1983`	`1983`	`.page-wrapper {`
`1984`	`1984`	`background-color: #ffffff;`
`1985`	`1985`	`padding-left: 8.8rem;`
`1986`		`- position: relative;`
`1987`		`- z-index: 1;`
`1988`	`1986`	`}`
`1989`	`1987`	`.page-content {`
`1990`	`1988`	`padding-left: 3rem;`
`@@ -2564,7 +2562,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {`
`2564`	`2562`	`}`
`2565`	`2563`	`.ui-dialog .main-col .breadcrumbs li:after,`
`2566`	`2564`	`.ui-dialog .magento_message .breadcrumbs li:after {`
`2567`		`- content: "";`
	`2565`	`+ content: '';`
`2568`	`2566`	`margin: 0 0.5rem 0 0;`
`2569`	`2567`	`}`
`2570`	`2568`	`.ui-dialog .main-col #contents-uploader,`
`@@ -2669,6 +2667,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {`
`2669`	`2667`	`}`
`2670`	`2668`	`.popup-window {`
`2671`	`2669`	`background: #ffffff;`
	`2670`	`+ z-index: 1010 !important;`
`2672`	`2671`	`}`
`2673`	`2672`	`.popup-window .table_window > tbody > tr > td {`
`2674`	`2673`	`background: #ffffff;`
`@@ -2691,7 +2690,7 @@ fieldset[disabled] .admin__control-text + .ui-datepicker-trigger {`
`2691`	`2690`	`margin: 0 0 0 3rem;`
`2692`	`2691`	`}`
`2693`	`2692`	`.overlay_magento {`
`2694`		`- z-index: 1000;`
	`2693`	`+ z-index: 800 !important;`
`2695`	`2694`	`}`
`2696`	`2695`	`.fade {`
`2697`	`2696`	`z-index: 1000;`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,6 @@ body {`
`29`	`29`	`.page-wrapper {`
`30`	`30`	`background-color: @page-wrapper__background-color;`
`31`	`31`	`padding-left: @page-wrapper__indent-left;`
`32`		`- position: relative;`
`33`		`- z-index: @page-wrapper__z-index__base; // Base z-index for page wrapper to prevent inner page element overlap with pop-ups`
`34`	`32`	`}`
`35`	`33`
`36`	`34`	`.page-content {`