Merge remote-tracking branch 'webdev/PR' into PR

guz-anton · guz-anton · commit 3ad2afd60205 · 2015-11-11T10:28:46.000+02:00
diff --git a/app/code/Magento/Backend/view/adminhtml/layout/default.xml b/app/code/Magento/Backend/view/adminhtml/layout/default.xml
@@ -8,7 +8,7 @@
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="admin-1column" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <head>
         <title>Magento Admin</title>
-        <meta name="viewport" content="width=device-width"/>
+        <meta name="viewport" content="width=1024, initial-scale=1"/>
         <link src="requirejs/require.js"/>
         <css src="extjs/resources/css/ext-all.css"/>
         <css src="extjs/resources/css/ytheme-magento.css"/>
diff --git a/app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js b/app/code/Magento/Catalog/view/adminhtml/web/catalog/product-attributes.js
@@ -24,6 +24,7 @@ define([
                 type: 'slide',
                 buttons: [],
                 opened: function () {
+                    $(this).parent().addClass('modal-content-new-attribute');
                     self.iframe = $('<iframe id="create_new_attribute_container">').attr({
                         src: self._prepareUrl(),
                         frameborder: 0
diff --git a/app/code/Magento/Paypal/etc/config.xml b/app/code/Magento/Paypal/etc/config.xml
@@ -10,7 +10,7 @@
         <paypal>
             <bncode>Magento_Cart_Community</bncode>
             <style>
-                <logo>nowAccepting_150x60</logo>
+                <logo></logo>
             </style>
             <wpp>
                 <api_password backend_model="Magento\Config\Model\Config\Backend\Encrypted" />
diff --git a/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Catalog/web/css/source/_module.less
@@ -69,6 +69,8 @@ div.removed,
 //  ---------------------------------------------
 
 .catalog-product-attribute-edit {
+    min-width: 0;
+
     &.attribute-popup {
         .page-wrapper {
             width: 100%;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/_structure.less b/app/design/adminhtml/Magento/backend/web/css/source/_structure.less
@@ -41,16 +41,6 @@ body {
     }
 }
 
-//  Scroll bar appearing compensation
-@media (min-width: @window__min-width) {
-  html {
-    width: 100vw;
-  }
-  body {
-    overflow-x: hidden;
-  }
-}
-
 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
     .page-layout-admin-2columns-left {
         .page-columns {
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_modals_extend.less
@@ -140,6 +140,11 @@
 }
 
 .modal-slide {
+    .modal-content-new-attribute {
+        overflow: auto;
+        -webkit-overflow-scrolling: touch;
+    }
+
     .modal-title {
         font-size: @modal-slide-title__font-size;
         margin-right: @modal-slide-title__font-size + @modal-slide__padding + 1rem;
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less b/app/design/adminhtml/Magento/backend/web/css/source/components/_popups.less
@@ -429,6 +429,28 @@
     }
 }
 
+.ie9 {
+    .catalog-product-attribute-edit {
+        &.attribute-popup {
+            min-width: 0;
+
+            .menu-wrapper {
+                display: none;
+            }
+
+            .page-actions {
+                button {
+                    float: none;
+                }
+
+                .primary {
+                    float: right;
+                }
+            }
+        }
+    }
+}
+
 //
 //  Prototype popup window
 //  _____________________________________________
