Skip to content

Commit 93e6615

Browse files
author
Bogdan Plieshka
committed
MAGETWO-34790: [UI] Manage Components
- Merged Setup & Updater applications
1 parent 45e19dd commit 93e6615

File tree

2 files changed

+61
-106
lines changed

2 files changed

+61
-106
lines changed

app/design/adminhtml/Magento/backend/web/app/setup/styles/less/setup.less

Lines changed: 61 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,48 +4,86 @@
44
*/
55

66
//
7-
// Global lib
7+
// Setup & Upgrade
88
// _____________________________________________
99

10-
@baseDir: '../';
10+
//
11+
// Lib (sources)
12+
// ---------------------------------------------
1113

14+
// Global lib
1215
@import '/lib/web/css/source/lib/_lib.less';
1316

14-
//
15-
// Inherit Backend Lib
16-
// _____________________________________________
17-
17+
// Inherit Backend lib (sources)
1818
@import '../../../../../web/css/source/_variables.less';
19+
@import '../../../../../web/css/source/_utilities.less';
20+
@import '../../../../../web/css/source/_extends.less';
1921
@import '../../../../../web/css/source/_reset.less';
2022
@import '../../../../../web/css/source/_typography.less';
23+
@import '../../../../../web/css/source/_lists.less';
24+
@import '../../../../../web/css/source/_structure.less';
2125
@import '../../../../../web/css/source/_grid.less';
2226

23-
//
24-
// Local lib
25-
// _____________________________________________
27+
// Setup lib (sources)
28+
@import 'lib/_variables.less';
29+
@import 'lib/_utilities.less';
30+
@import (reference) 'lib/_extends.less';
31+
@import 'lib/_classes.less';
32+
@import 'lib/_icons.less';
33+
@import 'lib/_lists.less';
34+
@import 'lib/_buttons.less';
35+
@import 'lib/_forms.less';
36+
@import 'lib/_structures.less';
2637

27-
@import 'lib/_lib.less';
38+
// Upgrade lib
39+
@import '../../../updater/styles/less/source/_variables.less';
40+
@import (reference) '../../../updater/styles/less/source/_extends.less';
41+
@import '../../../updater/styles/less/source/_typography.less';
42+
@import '../../../updater/styles/less/source/_lists.less';
43+
@import '../../../updater/styles/less/source/_forms.less';
44+
@import '../../../updater/styles/less/source/_structure.less';
2845

2946
//
30-
// Inherit Backend Components
31-
// _____________________________________________
47+
// Components
48+
// ---------------------------------------------
3249

50+
// Inherit Lib components
51+
@import '/lib/web/css/source/components/_modals.less';
52+
53+
// Inherit Backend components
54+
@import '../../../../../web/css/source/_actions.less';
3355
@import '../../../../../web/css/source/components/_messages.less';
56+
@import '../../../../../web/css/source/components/_modals_extend.less';
3457

35-
//
36-
// Components
37-
// _____________________________________________
58+
@import '../../../../../Magento_Backend/web/css/source/module/_header.less';
59+
@import '../../../../../Magento_Backend/web/css/source/module/_menu.less';
60+
61+
@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less';
62+
@import (reference) '../../../../../web/css/source/forms/_extends.less';
63+
@import '../../../../../web/css/source/forms/_controls.less';
64+
@import '../../../../../web/css/source/forms/_fields.less';
3865

66+
// Setup components
3967
@import 'components/_messages.less';
4068
@import 'components/_navigation-bar.less';
4169
@import 'components/_tooltips.less';
4270
@import 'components/_progress-bars.less';
4371
@import 'components/_spinner.less';
4472

73+
// Updater components
74+
@import '../../../updater/styles/less/components/_header.less';
75+
@import '../../../updater/styles/less/components/_menu.less';
76+
@import '../../../updater/styles/less/components/_modals.less';
77+
@import '../../../updater/styles/less/components/_data-grid.less';
78+
79+
// Updater components extends
80+
@import '../../../updater/styles/less/components/_navigation-bar_extend.less';
81+
4582
//
4683
// Pages
47-
// _____________________________________________
84+
// ---------------------------------------------
4885

86+
// Setup pages
4987
@import 'pages/_common.less';
5088
@import 'pages/_landing.less';
5189
@import 'pages/_license.less';
@@ -54,8 +92,13 @@
5492
@import 'pages/_customize-your-store.less';
5593
@import 'pages/_install.less';
5694

95+
// Updater pages
96+
@import '../../../updater/styles/less/pages/_common.less';
97+
@import '../../../updater/styles/less/pages/_home.less';
98+
@import '../../../updater/styles/less/pages/_readiness-check.less';
99+
57100
//
58101
// Media queries collector
59-
// _____________________________________________
102+
// ---------------------------------------------
60103

61-
@import 'lib/_collector.less';
104+
@import '../../../../../web/css/source/_responsive.less';

app/design/adminhtml/Magento/backend/web/app/updater/styles/less/updater.less

Lines changed: 0 additions & 88 deletions
This file was deleted.

0 commit comments

Comments
 (0)