Merge pull request #16 from magento-extensibility/MAGETWO-31776-add-parent-element-theme
[Extensibility] Magetwo 31776 add parent element theme
Showing
- app/code/Magento/Core/Model/Theme/Collection.php 1 addition, 9 deletionsapp/code/Magento/Core/Model/Theme/Collection.php
- app/design/adminhtml/Magento/backend/theme.xml 1 addition, 0 deletionsapp/design/adminhtml/Magento/backend/theme.xml
- app/design/frontend/Magento/blank/theme.xml 1 addition, 0 deletionsapp/design/frontend/Magento/blank/theme.xml
- app/design/frontend/Magento/luma/theme.xml 2 additions, 0 deletionsapp/design/frontend/Magento/luma/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/composer.json 0 additions, 11 deletions...del/Theme/Source/_files/design/frontend/a_d/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/a_d/theme.xml 1 addition, 0 deletions...e/Model/Theme/Source/_files/design/frontend/a_d/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/composer.json 0 additions, 11 deletions...del/Theme/Source/_files/design/frontend/b_e/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/b_e/theme.xml 1 addition, 0 deletions...e/Model/Theme/Source/_files/design/frontend/b_e/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/composer.json 0 additions, 11 deletions...urce/_files/design/frontend/magento_default/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_default/theme.xml 1 addition, 0 deletions...e/Source/_files/design/frontend/magento_default/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/composer.json 0 additions, 12 deletions...eme/Source/_files/design/frontend/magento_g/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/Theme/Source/_files/design/frontend/magento_g/theme.xml 2 additions, 0 deletions...l/Theme/Source/_files/design/frontend/magento_g/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/composer.json 0 additions, 11 deletions...e/Model/_files/design/adminhtml/Vendor/test/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/adminhtml/Vendor/test/theme.xml 1 addition, 0 deletions.../Core/Model/_files/design/adminhtml/Vendor/test/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/composer.json 0 additions, 11 deletions...del/_files/design/area_two/Vendor/theme_one/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/area_two/Vendor/theme_one/theme.xml 1 addition, 0 deletions...e/Model/_files/design/area_two/Vendor/theme_one/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/composer.json 0 additions, 11 deletions.../_files/design/design_area/Vendor/theme_one/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/design_area/Vendor/theme_one/theme.xml 1 addition, 0 deletions...odel/_files/design/design_area/Vendor/theme_one/theme.xml
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/composer.json 0 additions, 11 deletions...odel/_files/design/frontend/Magento/default/composer.json
- dev/tests/integration/testsuite/Magento/Core/Model/_files/design/frontend/Magento/default/theme.xml 1 addition, 0 deletions...re/Model/_files/design/frontend/Magento/default/theme.xml
Please register or sign in to comment