Skip to content

Commit 3c8355b

Browse files
committed
MAGETWO-34363: Pull request processing
1 parent 45a32d8 commit 3c8355b

File tree

3 files changed

+22
-21
lines changed

3 files changed

+22
-21
lines changed

app/code/Magento/Core/etc/di.xml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,25 @@
5252
<argument name="scopeType" xsi:type="const">Magento\Store\Model\ScopeInterface::SCOPE_STORE</argument>
5353
</arguments>
5454
</type>
55+
<type name="Magento\Framework\View\Asset\PreProcessor\Pool">
56+
<arguments>
57+
<argument name="preProcessors" xsi:type="array">
58+
<item name="less" xsi:type="array">
59+
<item name="css" xsi:type="array">
60+
<item name="less_css" xsi:type="string">Magento\Framework\Css\PreProcessor\Less</item>
61+
<item name="module_notation" xsi:type="string">Magento\Framework\View\Asset\PreProcessor\ModuleNotation</item>
62+
</item>
63+
<item name="less" xsi:type="array">
64+
<item name="magento_import" xsi:type="string">Magento\Framework\Less\PreProcessor\Instruction\MagentoImport</item>
65+
<item name="import" xsi:type="string">Magento\Framework\Less\PreProcessor\Instruction\Import</item>
66+
</item>
67+
</item>
68+
<item name="css" xsi:type="array">
69+
<item name="css" xsi:type="array">
70+
<item name="module_notation" xsi:type="string">Magento\Framework\View\Asset\PreProcessor\ModuleNotation</item>
71+
</item>
72+
</item>
73+
</argument>
74+
</arguments>
75+
</type>
5576
</config>

app/code/Magento/Translation/view/base/templates/translate.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
// @codingStandardsIgnoreFile
67
?>
78
<?php /** @var $block \Magento\Translation\Block\Js */ ?>
89
<?php if ($block->dictionaryEnabled()): ?>

app/etc/di.xml

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -674,27 +674,6 @@
674674
<argument name="raise_php_limits" xsi:type="boolean">false</argument>
675675
</arguments>
676676
</type>
677-
<type name="Magento\Framework\View\Asset\PreProcessor\Pool">
678-
<arguments>
679-
<argument name="preProcessors" xsi:type="array">
680-
<item name="less" xsi:type="array">
681-
<item name="css" xsi:type="array">
682-
<item name="less_css" xsi:type="string">Magento\Framework\Css\PreProcessor\Less</item>
683-
<item name="module_notation" xsi:type="string">Magento\Framework\View\Asset\PreProcessor\ModuleNotation</item>
684-
</item>
685-
<item name="less" xsi:type="array">
686-
<item name="magento_import" xsi:type="string">Magento\Framework\Less\PreProcessor\Instruction\MagentoImport</item>
687-
<item name="import" xsi:type="string">Magento\Framework\Less\PreProcessor\Instruction\Import</item>
688-
</item>
689-
</item>
690-
<item name="css" xsi:type="array">
691-
<item name="css" xsi:type="array">
692-
<item name="module_notation" xsi:type="string">Magento\Framework\View\Asset\PreProcessor\ModuleNotation</item>
693-
</item>
694-
</item>
695-
</argument>
696-
</arguments>
697-
</type>
698677
<type name="Magento\Framework\App\DefaultPath\DefaultPath">
699678
<arguments>
700679
<argument name="parts" xsi:type="array">

0 commit comments

Comments
 (0)