Skip to content

Commit 2ce56d1

Browse files
committed
Merge branch 'MAGETWO-44674' of github.corp.magento.com:magento-webdev/magento2ce into MAGETWO-44603
2 parents 4b42bdc + a776f6a commit 2ce56d1

Some content is hidden

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

67 files changed

+260
-328
lines changed

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less renamed to app/design/adminhtml/Magento/backend/web/app/setup/styles/less/_setup.less

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// ---------------------------------------------
1313

1414
// Global lib
15-
//@import '/lib/web/css/source/lib/_lib.less'; // ToDo UI: deploy link to module
15+
@import '/lib/web/css/source/lib/_lib.less';
1616

1717
// Inherit Backend lib (sources)
1818
@import '../../../../css/source/_variables.less';
@@ -48,7 +48,7 @@
4848
// ---------------------------------------------
4949

5050
// Inherit Lib components
51-
//@import '/lib/web/css/source/components/_modals.less'; // ToDo UI: deploy link to module
51+
@import '/lib/web/css/source/components/_modals.less';
5252

5353
// Inherit Backend components
5454
@import '../../../../css/source/_actions.less';
@@ -57,12 +57,12 @@
5757
@import '../../../../css/source/components/_modals_extend.less';
5858
@import '../../../../css/source/components/_spinner.less';
5959

60-
//@import '../../../../../Magento_Backend/web/css/source/module/_header.less'; // ToDo UI: deploy link to module
61-
//@import '../../../../../Magento_Backend/web/css/source/module/_menu.less'; // ToDo UI: deploy link to module
62-
//@import '../../../../../Magento_Backend/web/css/source/module/main/_actions-bar.less'; // ToDo UI: deploy link to module
63-
//@import '../../../../../Magento_Backend/web/css/source/module/main/_page-nav.less'; // ToDo UI: deploy link to module
60+
@import '../../../../../Magento_Backend/web/css/source/module/_header.less';
61+
@import '../../../../../Magento_Backend/web/css/source/module/_menu.less';
62+
@import '../../../../../Magento_Backend/web/css/source/module/main/_actions-bar.less';
63+
@import '../../../../../Magento_Backend/web/css/source/module/main/_page-nav.less';
6464

65-
//@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less'; // ToDo UI: deploy link to module
65+
@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less';
6666
@import (reference) '../../../../css/source/forms/_extends.less';
6767
@import '../../../../css/source/forms/_controls.less';
6868
@import '../../../../css/source/forms/_fields.less';

app/design/adminhtml/Magento/backend/web/css/styles-old.less

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
@baseDir: "../"; // Default
99

1010
// Backend
11-
@import "../mui/clearless/all.less";
12-
@import "../mui/styles/vars.less";
13-
@import (reference) "../mui/styles/abstract.less"; // Import some abstract
11+
@import "../mui/clearless/_all.less";
12+
@import "../mui/styles/_vars.less";
13+
@import (reference) "../mui/styles/_abstract.less"; // Import some abstract
1414

1515
// DO NOT REMOVE! Can be dangerous (need for Product Creation)
1616
.collapse.in,
@@ -26,8 +26,8 @@
2626
.admin__scope-old {
2727
box-sizing: content-box;
2828

29-
@import "../mui/styles/base.less";
30-
@import "../mui/styles/table.less"; // Import table styles
29+
@import "../mui/styles/_base.less";
30+
@import "../mui/styles/_table.less"; // Import table styles
3131

3232
.field {
3333
position: relative;
@@ -4126,7 +4126,7 @@
41264126

41274127

41284128
// Magento Import instructions
4129-
//@magento_import "source/module.less"; // import theme styles
4129+
//@magento_import "source/_module-old.less"; // import theme styles
41304130

41314131
//
41324132
// WYSIWYG editor styles fixes

0 commit comments

Comments
 (0)