Skip to content

Commit 769cb12

Browse files
Dell-Dell-
committed
MAGETWO-44603: Styles are lost on Storefront if CSS files minification is enabled in "default" mode
- Fixed bug MAGETWO-44469 - Fixed less templates - Renaming command - Added new exception into Less processor
1 parent 2ce56d1 commit 769cb12

File tree

12 files changed

+80
-104
lines changed

12 files changed

+80
-104
lines changed

‎app/code/Magento/Deploy/Model/Filesystem.php

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,16 @@
33
* Copyright © 2015 Magento. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Deploy\Model;
87

98
use Magento\Framework\App\State;
109
use Magento\Framework\App\DeploymentConfig\Writer;
1110
use Magento\Framework\App\Filesystem\DirectoryList;
12-
use Magento\Developer\Console\Command\SourceThemeDeployCommand;
1311

1412
/**
15-
* A class to manage Magento modes
13+
* Class Filesystem
1614
*
15+
* A class to manage Magento modes
1716
*/
1817
class Filesystem
1918
{
@@ -118,38 +117,11 @@ public function regenerateStatic(
118117

119118
// Trigger static assets compilation and deployment
120119
$this->deployStaticContent($output);
121-
$this->deployCss($output);
122120
// Trigger code generation
123121
$this->compile($output);
124122
$this->lockStaticResources();
125123
}
126124

127-
/**
128-
* Deploy CSS
129-
*
130-
* @param \Symfony\Component\Console\Output\OutputInterface $output
131-
* @return void
132-
*/
133-
protected function deployCss(
134-
\Symfony\Component\Console\Output\OutputInterface $output
135-
) {
136-
$themeLocalePairs = $this->storeView->retrieveThemeLocalePairs();
137-
foreach ($themeLocalePairs as $themeLocalePair) {
138-
$theme = $themeLocalePair['theme'] ?: self::DEFAULT_THEME;
139-
$cmd = $this->functionCallPath . 'dev:source_theme:deploy'
140-
. ' --' . SourceThemeDeployCommand::TYPE_ARGUMENT . '="less"'
141-
. ' --' . SourceThemeDeployCommand::THEME_OPTION . '="' . $theme . '"'
142-
. ' --' . SourceThemeDeployCommand::LOCALE_OPTION . '="' . $themeLocalePair['locale'] . '"';
143-
144-
/**
145-
* @todo build a solution that does not depend on exec
146-
*/
147-
$execOutput = $this->shell->execute($cmd);
148-
$output->writeln($execOutput);
149-
}
150-
$output->writeln('CSS deployment complete');
151-
}
152-
153125
/**
154126
* Deploy static content
155127
*

‎app/code/Magento/Developer/Console/Command/SourceThemeDeployCommand.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ public function __construct(
7474
Publisher $assetPublisher,
7575
Repository $assetRepository
7676
) {
77-
parent::__construct('dev:source_theme:deploy');
77+
parent::__construct('dev:source-theme:deploy');
7878
$this->validator = $validator;
7979
$this->assetPublisher = $assetPublisher;
8080
$this->assetRepository = $assetRepository;

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

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

1414
// Global lib
15-
@import '/lib/web/css/source/lib/_lib.less';
15+
//@import '/lib/web/css/source/lib/_lib.less';
1616

1717
// Inherit Backend lib (sources)
18-
@import '../../../../css/source/_variables.less';
19-
@import '../../../../css/source/_utilities.less';
20-
@import '../../../../css/source/_extends.less';
21-
@import '../../../../css/source/_reset.less';
22-
@import '../../../../css/source/_typography.less';
23-
@import '../../../../css/source/_lists.less';
24-
@import '../../../../css/source/_structure.less';
25-
@import '../../../../css/source/_grid.less';
18+
//@import '../../../../css/source/_variables.less';
19+
//@import '../../../../css/source/_utilities.less';
20+
//@import '../../../../css/source/_extends.less';
21+
//@import '../../../../css/source/_reset.less';
22+
//@import '../../../../css/source/_typography.less';
23+
//@import '../../../../css/source/_lists.less';
24+
//@import '../../../../css/source/_structure.less';
25+
//@import '../../../../css/source/_grid.less';
2626

2727
// 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';
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';
3737

3838
// 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';
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';
4545

4646
//
4747
// Components
4848
// ---------------------------------------------
4949

5050
// Inherit Lib components
51-
@import '/lib/web/css/source/components/_modals.less';
51+
//@import '/lib/web/css/source/components/_modals.less';
5252

5353
// Inherit Backend components
54-
@import '../../../../css/source/_actions.less';
55-
@import '../../../../css/source/actions/_actions-switcher.less'; // ToDo UI: remove when yes/no switcher is integrated to the backend
56-
@import '../../../../css/source/components/_messages.less';
57-
@import '../../../../css/source/components/_modals_extend.less';
58-
@import '../../../../css/source/components/_spinner.less';
59-
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';
64-
65-
@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less';
66-
@import (reference) '../../../../css/source/forms/_extends.less';
67-
@import '../../../../css/source/forms/_controls.less';
68-
@import '../../../../css/source/forms/_fields.less';
54+
//@import '../../../../css/source/_actions.less';
55+
//@import '../../../../css/source/actions/_actions-switcher.less'; // ToDo UI: remove when yes/no switcher is integrated to the backend
56+
//@import '../../../../css/source/components/_messages.less';
57+
//@import '../../../../css/source/components/_modals_extend.less';
58+
//@import '../../../../css/source/components/_spinner.less';
59+
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';
64+
65+
//@import '../../../../../Magento_Ui/web/css/source/module/_data-grid.less';
66+
//@import (reference) '../../../../css/source/forms/_extends.less';
67+
//@import '../../../../css/source/forms/_controls.less';
68+
//@import '../../../../css/source/forms/_fields.less';
6969

7070
// Setup components
71-
@import 'components/_messages.less';
72-
@import 'components/_navigation-bar.less';
73-
@import 'components/_tooltips.less';
74-
@import 'components/_progress-bars.less';
71+
//@import 'components/_messages.less';
72+
//@import 'components/_navigation-bar.less';
73+
//@import 'components/_tooltips.less';
74+
//@import 'components/_progress-bars.less';
7575

7676
// Updater components
77-
@import '../../../updater/styles/less/components/_page-inner.less';
78-
@import '../../../updater/styles/less/components/_header.less';
79-
@import '../../../updater/styles/less/components/_menu.less';
80-
@import '../../../updater/styles/less/components/_modals.less';
81-
@import '../../../updater/styles/less/components/_data-grid.less';
77+
//@import '../../../updater/styles/less/components/_page-inner.less';
78+
//@import '../../../updater/styles/less/components/_header.less';
79+
//@import '../../../updater/styles/less/components/_menu.less';
80+
//@import '../../../updater/styles/less/components/_modals.less';
81+
//@import '../../../updater/styles/less/components/_data-grid.less';
8282

8383
// Updater components extends
84-
@import '../../../updater/styles/less/components/_navigation-bar_extend.less';
84+
//@import '../../../updater/styles/less/components/_navigation-bar_extend.less';
8585

8686
//
8787
// Pages
8888
// ---------------------------------------------
8989

9090
// Setup pages
91-
@import 'pages/_common.less';
92-
@import 'pages/_landing.less';
93-
@import 'pages/_license.less';
94-
@import 'pages/_readiness-check.less';
95-
@import 'pages/_web-configuration.less';
96-
@import 'pages/_customize-your-store.less';
97-
@import 'pages/_install.less';
91+
//@import 'pages/_common.less';
92+
//@import 'pages/_landing.less';
93+
//@import 'pages/_license.less';
94+
//@import 'pages/_readiness-check.less';
95+
//@import 'pages/_web-configuration.less';
96+
//@import 'pages/_customize-your-store.less';
97+
//@import 'pages/_install.less';
9898

9999
// Updater pages
100-
@import '../../../updater/styles/less/pages/_common.less';
101-
@import '../../../updater/styles/less/pages/_home.less';
102-
@import '../../../updater/styles/less/pages/_component-manager.less';
103-
@import '../../../updater/styles/less/pages/_login.less';
100+
//@import '../../../updater/styles/less/pages/_common.less';
101+
//@import '../../../updater/styles/less/pages/_home.less';
102+
//@import '../../../updater/styles/less/pages/_component-manager.less';
103+
//@import '../../../updater/styles/less/pages/_login.less';
104104

105105
//
106106
// Media queries collector
107107
// ---------------------------------------------
108108

109-
@import '../../../../css/source/_responsive.less';
109+
//@import '../../../../css/source/_responsive.less';

‎app/design/adminhtml/Magento/backend/web/mui/clearless/_all.less

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
// Handily import all ClearLess mixins
88
// ==============================================
99

10-
@import "settings.less";
11-
@import "helpers.less";
12-
@import "sprites.less";
13-
@import "icons.less";
14-
@import "arrows.less";
10+
@import "_settings.less";
11+
@import "_helpers.less";
12+
@import "_sprites.less";
13+
@import "_icons.less";
14+
@import "_arrows.less";

‎app/design/adminhtml/Magento/backend/web/mui/clearless/arrows.less renamed to ‎app/design/adminhtml/Magento/backend/web/mui/clearless/_arrows.less

File renamed without changes.

‎app/design/adminhtml/Magento/backend/web/mui/clearless/helpers.less renamed to ‎app/design/adminhtml/Magento/backend/web/mui/clearless/_helpers.less

File renamed without changes.

‎app/design/adminhtml/Magento/backend/web/mui/clearless/icons.less renamed to ‎app/design/adminhtml/Magento/backend/web/mui/clearless/_icons.less

File renamed without changes.

‎app/design/adminhtml/Magento/backend/web/mui/clearless/settings.less renamed to ‎app/design/adminhtml/Magento/backend/web/mui/clearless/_settings.less

File renamed without changes.

‎app/design/adminhtml/Magento/backend/web/mui/clearless/sprites.less renamed to ‎app/design/adminhtml/Magento/backend/web/mui/clearless/_sprites.less

File renamed without changes.

‎dev/tools/grunt/configs/combo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ module.exports = {
1616
var cmdPlus = /^win/.test(process.platform) ? ' & ' : ' && ',
1717
command = 'grunt --force clean:' + themeName + cmdPlus;
1818

19-
command = command + 'php bin/magento dev:source_theme:deploy ' +
19+
command = command + 'php bin/magento dev:source-theme:deploy ' +
2020
theme[themeName].files.join(' ') +
2121
' --type=less' +
2222
' --locale=' + theme[themeName].locale +

0 commit comments

Comments
 (0)