Merge branch 'mainline-develop' into CICD-1572
Showing
- app/code/Magento/Catalog/Model/Observer.php 26 additions, 6 deletionsapp/code/Magento/Catalog/Model/Observer.php
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable.phtml 2 additions, 2 deletions.../view/adminhtml/templates/product/edit/downloadable.phtml
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/links.phtml 66 additions, 63 deletions...adminhtml/templates/product/edit/downloadable/links.phtml
- app/code/Magento/Downloadable/view/adminhtml/templates/product/edit/downloadable/samples.phtml 47 additions, 40 deletions...minhtml/templates/product/edit/downloadable/samples.phtml
- app/code/Magento/Theme/Block/Html/Topmenu.php 29 additions, 5 deletionsapp/code/Magento/Theme/Block/Html/Topmenu.php
- app/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php 141 additions, 0 deletionsapp/code/Magento/Theme/Test/Unit/Block/Html/TopmenuTest.php
- app/design/adminhtml/Magento/backend/Magento_Downloadable/web/css/source/_module.less 81 additions, 0 deletions.../backend/Magento_Downloadable/web/css/source/_module.less
- app/design/adminhtml/Magento/backend/web/css/override.less 150 additions, 2 deletionsapp/design/adminhtml/Magento/backend/web/css/override.less
- app/design/adminhtml/Magento/backend/web/css/source/forms/_control-table.less 54 additions, 0 deletions.../Magento/backend/web/css/source/forms/_control-table.less
- app/design/adminhtml/Magento/backend/web/css/source/forms/_controls.less 2 additions, 1 deletion...nhtml/Magento/backend/web/css/source/forms/_controls.less
- app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less 6 additions, 1 deletion...minhtml/Magento/backend/web/css/source/forms/_fields.less
- app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/_module.less 3 additions, 0 deletions...agento/blank/Magento_Checkout/web/css/source/_module.less
- dev/tools/grunt/configs/watch.js 6 additions, 0 deletionsdev/tools/grunt/configs/watch.js
- lib/internal/Magento/Framework/Data/Tree/NodeFactory.php 54 additions, 0 deletionslib/internal/Magento/Framework/Data/Tree/NodeFactory.php
- lib/internal/Magento/Framework/Data/TreeFactory.php 54 additions, 0 deletionslib/internal/Magento/Framework/Data/TreeFactory.php
- lib/web/css/source/lib/_navigation.less 104 additions, 30 deletionslib/web/css/source/lib/_navigation.less
- lib/web/css/source/lib/variables/_colors.less 1 addition, 0 deletionslib/web/css/source/lib/variables/_colors.less
- lib/web/css/source/lib/variables/_navigation.less 19 additions, 7 deletionslib/web/css/source/lib/variables/_navigation.less
Please register or sign in to comment