Skip to content

Commit 19ad496

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #50 from magento-ogre/PR_Branch
[Ogres] Bug fixes
2 parents ccbfd27 + 7480f9a commit 19ad496

File tree

76 files changed

+4964
-287
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+4964
-287
lines changed

‎.htaccess

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,32 @@
5858

5959
</IfModule>
6060

61+
<IfModule mod_php7.c>
62+
63+
############################################
64+
## adjust memory limit
65+
66+
php_value memory_limit 768M
67+
php_value max_execution_time 18000
68+
69+
############################################
70+
## disable automatic session start
71+
## before autoload was initialized
72+
73+
php_flag session.auto_start off
74+
75+
############################################
76+
## enable resulting html compression
77+
78+
#php_flag zlib.output_compression on
79+
80+
###########################################
81+
## disable user agent verification to not break multiple image upload
82+
83+
php_flag suhosin.session.cryptua off
84+
85+
</IfModule>
86+
6187
<IfModule mod_security.c>
6288
###########################################
6389
## disable POST processing to not break multiple image upload

‎app/design/adminhtml/Magento/backend/Magento_Enterprise/layout/default.xml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
9+
<body>
10+
<referenceBlock name="logo">
11+
<arguments>
12+
<argument name="edition" xsi:type="string">Enterprise</argument>
13+
</arguments>
14+
</referenceBlock>
15+
</body>
16+
</page>

‎app/design/adminhtml/Magento/backend/Magento_GiftCard/web/css/source/module.less

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
.ie9 & {
7+
.giftcard-info-container {
8+
.admin__field {
9+
.admin__field-label {
10+
display: table;
11+
span {
12+
display: table-cell;
13+
}
14+
}
15+
}
16+
}
17+
}

‎app/design/adminhtml/Magento/backend/Magento_Reward/web/css/source/_module.less

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Reward Page
8+
// _____________________________________________
9+
10+
//
11+
// Variables
12+
// ---------------------------------------------
13+
14+
@boundary__margin: 30px;
15+
@boundary__ratio: 1.75;
16+
17+
.adminhtml-reward-rate-edit {
18+
.field-rate {
19+
.admin__field-control {
20+
&:extend(.abs-clearfix all);
21+
}
22+
.boundary {
23+
float: left;
24+
width: 125px;
25+
}
26+
.boundary-upper {
27+
margin-left: @boundary__margin;
28+
position: relative;
29+
&:before {
30+
content: '»';
31+
left: -(@boundary__margin / @boundary__ratio);
32+
position: absolute;
33+
top: 25%;
34+
}
35+
label {
36+
.lib-visibility-hidden();
37+
display: block;
38+
}
39+
}
40+
}
41+
}

‎app/design/adminhtml/Magento/backend/Magento_VersionsCms/web/css/source/_module.less

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// /**
2+
// * Copyright © 2015 Magento. All rights reserved.
3+
// * See COPYING.txt for license details.
4+
// */
5+
6+
//
7+
// Hierarchy styles
8+
// _____________________________________________
9+
10+
.cms-hierarchy {
11+
&:extend(.abs-clearfix all);
12+
13+
.cms-hierarchy-tree,
14+
.cms-hierarchy-node {
15+
float: left;
16+
width: 50%;
17+
}
18+
19+
.cms_page_grid_container {
20+
clear: both;
21+
}
22+
23+
.admin__page-section-title {
24+
.actions {
25+
float: right;
26+
}
27+
}
28+
29+
.buttons-set {
30+
margin: 0 0 1.14rem;
31+
button {
32+
margin-right: 0.36rem;
33+
}
34+
}
35+
}

0 commit comments

Comments
 (0)