Merge pull request #50 from magento-ogre/PR_Branch

[Ogres] Bug fixes
magento · Oct 28, 2015 · 19ad496 · 19ad496
2 parents ccbfd27 + 7480f9a
commit 19ad496
Show file tree

Hide file tree

Showing 76 changed files with 4,964 additions and 287 deletions.
diff --git a/.htaccess b/.htaccess
@@ -58,6 +58,32 @@
 
 </IfModule>
 
+<IfModule mod_php7.c>
+
+############################################
+## adjust memory limit
+
+    php_value memory_limit 768M
+    php_value max_execution_time 18000
+
+############################################
+## disable automatic session start
+## before autoload was initialized
+
+    php_flag session.auto_start off
+
+############################################
+## enable resulting html compression
+
+    #php_flag zlib.output_compression on
+
+###########################################
+## disable user agent verification to not break multiple image upload
+
+    php_flag suhosin.session.cryptua off
+
+</IfModule>
+
 <IfModule mod_security.c>
 ###########################################
 ## disable POST processing to not break multiple image upload

diff --git a/app/design/adminhtml/Magento/backend/Magento_Enterprise/layout/default.xml b/app/design/adminhtml/Magento/backend/Magento_Enterprise/layout/default.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © 2015 Magento. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
+    <body>
+        <referenceBlock name="logo">
+            <arguments>
+                <argument name="edition" xsi:type="string">Enterprise</argument>
+            </arguments>
+        </referenceBlock>
+    </body>
+</page>
diff --git a/app/design/adminhtml/Magento/backend/Magento_GiftCard/web/css/source/module.less b/app/design/adminhtml/Magento/backend/Magento_GiftCard/web/css/source/module.less
@@ -0,0 +1,17 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+.ie9 & {
+    .giftcard-info-container {
+        .admin__field {
+            .admin__field-label {
+                display: table;
+                span {
+                    display: table-cell;
+                }
+            }
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_Reward/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_Reward/web/css/source/_module.less
@@ -0,0 +1,41 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Reward Page
+//  _____________________________________________
+
+//
+//  Variables
+//  ---------------------------------------------
+
+@boundary__margin: 30px;
+@boundary__ratio: 1.75;
+
+.adminhtml-reward-rate-edit {
+    .field-rate {
+        .admin__field-control {
+            &:extend(.abs-clearfix all);
+        }
+        .boundary {
+            float: left;
+            width: 125px;
+        }
+        .boundary-upper {
+            margin-left: @boundary__margin;
+            position: relative;
+            &:before {
+                content: '»';
+                left: -(@boundary__margin / @boundary__ratio);
+                position: absolute;
+                top: 25%;
+            }
+            label {
+                .lib-visibility-hidden();
+                display: block;
+            }
+        }
+    }
+}
diff --git a/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/_module.less b/app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/_module.less
@@ -0,0 +1,35 @@
+// /**
+//  * Copyright © 2015 Magento. All rights reserved.
+//  * See COPYING.txt for license details.
+//  */
+
+//
+//  Hierarchy styles
+//  _____________________________________________
+
+.cms-hierarchy {
+    &:extend(.abs-clearfix all);
+
+    .cms-hierarchy-tree,
+    .cms-hierarchy-node {
+        float: left;
+        width: 50%;
+    }
+
+    .cms_page_grid_container {
+        clear: both;
+    }
+
+    .admin__page-section-title {
+        .actions {
+            float: right;
+        }
+    }
+
+    .buttons-set {
+        margin: 0 0 1.14rem;
+        button {
+            margin-right: 0.36rem;
+        }
+    }
+}