Skip to content

Commit 04931e6

Browse files
dkvashninbaydkvashninbay
committed
Merge remote-tracking branch 'main/develop' into MAGETWO-32004
2 parents b4ae175 + 7689e4d commit 04931e6

File tree

602 files changed

+17259
-6010
lines changed

Some content is hidden

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

602 files changed

+17259
-6010
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ atlassian*
3737
!/pub/media/wysiwyg/.htaccess
3838
/pub/media/tmp/*
3939
!/pub/media/tmp/.htaccess
40+
/pub/media/captcha/*
4041
/pub/static/*
4142
!/pub/static/.htaccess
4243

‎Gruntfile.js

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,17 @@ module.exports = function (grunt) {
2323
require('load-grunt-config')(grunt, {
2424
configPath: path.join(__dirname, configDir),
2525
init: true,
26-
loadGruntTasks: {
27-
pattern: [
28-
'grunt-*'
29-
]
26+
jitGrunt: {
27+
staticMappings: {
28+
usebanner: 'grunt-banner'
29+
}
3030
}
3131
});
3232

3333
_.each({
3434
/**
3535
* Assembling tasks.
36-
* ToDo UI: define default tasks.
36+
* ToDo: define default tasks.
3737
*/
3838
default: function () {
3939
grunt.log.subhead('I\'m default task and at the moment I\'m empty, sorry :/');
@@ -43,17 +43,19 @@ module.exports = function (grunt) {
4343
* Production preparation task.
4444
*/
4545
prod: function (component) {
46-
if (component === 'setup') {
47-
grunt.task.run([
48-
'less:' + component,
49-
'autoprefixer:' + component,
50-
'cssmin:' + component,
51-
'usebanner:' + component
52-
]);
53-
}
46+
var tasks = [
47+
'less',
48+
'autoprefixer',
49+
'cssmin',
50+
'usebanner'
51+
].map(function(task){
52+
return task + ':' + component;
53+
});
5454

5555
if (typeof component === 'undefined') {
5656
grunt.log.subhead('Tip: Please make sure that u specify prod subtask. By default prod task do nothing');
57+
} else {
58+
grunt.task.run(tasks);
5759
}
5860
},
5961

‎app/code/Magento/AdminNotification/Block/System/Messages.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,7 @@ public function getSystemMessageDialogJson()
123123
'autoOpen' => false,
124124
'width' => '75%',
125125
'modal' => true,
126+
'minHeight' => '0',
126127
'dialogClass' => 'ui-dialog-active ui-popup-message',
127128
'ajaxUrl' => $this->_getMessagesUrl()
128129
],

‎app/code/Magento/AdminNotification/view/adminhtml/templates/system/messages/popup.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ require([
3131
resizable: false,
3232
width: '75%',
3333
modal: true,
34+
minHeight: '0',
3435
dialogClass: 'ui-popup-message',
3536
position: {
3637
my: 'left+12.5% top',

‎app/code/Magento/Backend/Block/Context.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ class Context extends \Magento\Framework\View\Element\Context
2424
* @param \Magento\Framework\View\LayoutInterface $layout
2525
* @param \Magento\Framework\Event\ManagerInterface $eventManager
2626
* @param \Magento\Framework\UrlInterface $urlBuilder
27-
* @param \Magento\Framework\TranslateInterface $translator
2827
* @param \Magento\Framework\App\CacheInterface $cache
2928
* @param \Magento\Framework\View\DesignInterface $design
3029
* @param \Magento\Framework\Session\SessionManagerInterface $session
@@ -47,7 +46,6 @@ public function __construct(
4746
\Magento\Framework\View\LayoutInterface $layout,
4847
\Magento\Framework\Event\ManagerInterface $eventManager,
4948
\Magento\Framework\UrlInterface $urlBuilder,
50-
\Magento\Framework\TranslateInterface $translator,
5149
\Magento\Framework\App\CacheInterface $cache,
5250
\Magento\Framework\View\DesignInterface $design,
5351
\Magento\Framework\Session\SessionManagerInterface $session,
@@ -69,7 +67,6 @@ public function __construct(
6967
$layout,
7068
$eventManager,
7169
$urlBuilder,
72-
$translator,
7370
$cache,
7471
$design,
7572
$session,

‎app/code/Magento/Backend/Block/Template/Context.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@ class Context extends \Magento\Framework\View\Element\Template\Context
4848
* @param \Magento\Framework\View\LayoutInterface $layout
4949
* @param \Magento\Framework\Event\ManagerInterface $eventManager
5050
* @param \Magento\Framework\UrlInterface $urlBuilder
51-
* @param \Magento\Framework\TranslateInterface $translator
5251
* @param \Magento\Framework\App\CacheInterface $cache
5352
* @param \Magento\Framework\View\DesignInterface $design
5453
* @param \Magento\Framework\Session\Generic $session
@@ -81,7 +80,6 @@ public function __construct(
8180
\Magento\Framework\View\LayoutInterface $layout,
8281
\Magento\Framework\Event\ManagerInterface $eventManager,
8382
\Magento\Framework\UrlInterface $urlBuilder,
84-
\Magento\Framework\TranslateInterface $translator,
8583
\Magento\Framework\App\CacheInterface $cache,
8684
\Magento\Framework\View\DesignInterface $design,
8785
\Magento\Framework\Session\Generic $session,
@@ -117,7 +115,6 @@ public function __construct(
117115
$layout,
118116
$eventManager,
119117
$urlBuilder,
120-
$translator,
121118
$cache,
122119
$design,
123120
$session,

‎app/code/Magento/Backend/Block/Widget/Context.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ class Context extends \Magento\Backend\Block\Template\Context
3131
* @param \Magento\Framework\View\LayoutInterface $layout
3232
* @param \Magento\Framework\Event\ManagerInterface $eventManager
3333
* @param \Magento\Framework\UrlInterface $urlBuilder
34-
* @param \Magento\Framework\TranslateInterface $translator
3534
* @param \Magento\Framework\App\CacheInterface $cache
3635
* @param \Magento\Framework\View\DesignInterface $design
3736
* @param \Magento\Framework\Session\Generic $session
@@ -66,7 +65,6 @@ public function __construct(
6665
\Magento\Framework\View\LayoutInterface $layout,
6766
\Magento\Framework\Event\ManagerInterface $eventManager,
6867
\Magento\Framework\UrlInterface $urlBuilder,
69-
\Magento\Framework\TranslateInterface $translator,
7068
\Magento\Framework\App\CacheInterface $cache,
7169
\Magento\Framework\View\DesignInterface $design,
7270
\Magento\Framework\Session\Generic $session,
@@ -99,7 +97,6 @@ public function __construct(
9997
$layout,
10098
$eventManager,
10199
$urlBuilder,
102-
$translator,
103100
$cache,
104101
$design,
105102
$session,

‎app/code/Magento/Backend/Block/Widget/Grid.php

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -436,12 +436,12 @@ protected function _prepareFilterButtons()
436436
$this->getLayout()->createBlock(
437437
'Magento\Backend\Block\Widget\Button'
438438
)->setData(
439-
['label' => __('Reset Filter'), 'onclick' => $this->getJsObjectName() . '.resetFilter()', 'class' => 'action-reset']
440-
)->setDataAttribute(
441439
[
442-
'action' => 'grid-filter-reset'
440+
'label' => __('Reset Filter'),
441+
'onclick' => $this->getJsObjectName() . '.resetFilter()',
442+
'class' => 'action-reset action-tertiary'
443443
]
444-
)
444+
)->setDataAttribute(['action' => 'grid-filter-reset'])
445445
);
446446
$this->setChild(
447447
'search_button',
@@ -451,13 +451,9 @@ protected function _prepareFilterButtons()
451451
[
452452
'label' => __('Search'),
453453
'onclick' => $this->getJsObjectName() . '.doFilter()',
454-
'class' => 'task',
454+
'class' => 'action-secondary',
455455
]
456-
)->setDataAttribute(
457-
[
458-
'action' => 'grid-filter-apply'
459-
]
460-
)
456+
)->setDataAttribute(['action' => 'grid-filter-apply'])
461457
);
462458
}
463459

@@ -820,8 +816,8 @@ public function getMainButtonsHtml()
820816
{
821817
$html = '';
822818
if ($this->getColumnSet()->isFilterVisible()) {
823-
$html .= $this->getResetFilterButtonHtml();
824819
$html .= $this->getSearchButtonHtml();
820+
$html .= $this->getResetFilterButtonHtml();
825821
}
826822
return $html;
827823
}

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Date.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public function getHtml()
5858
' value="' .
5959
$this->getEscapedValue(
6060
'from'
61-
) . '" class="input-text no-changes" placeholder="' . __(
61+
) . '" class="admin__control-text input-text no-changes" placeholder="' . __(
6262
'From'
6363
) . '" ' . $this->getUiId(
6464
'filter',
@@ -74,7 +74,7 @@ public function getHtml()
7474
' value="' .
7575
$this->getEscapedValue(
7676
'to'
77-
) . '" class="input-text no-changes" placeholder="' . __(
77+
) . '" class="input-text admin__control-text no-changes" placeholder="' . __(
7878
'To'
7979
) . '" ' . $this->getUiId(
8080
'filter',

‎app/code/Magento/Backend/Block/Widget/Grid/Column/Filter/Select.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public function getHtml()
6666
$html = '<select name="' . $this->_getHtmlName() . '" id="' . $this->_getHtmlId() . '"' . $this->getUiId(
6767
'filter',
6868
$this->_getHtmlName()
69-
) . 'class="admin__control-select no-changes">';
69+
) . 'class="no-changes admin__control-select">';
7070
$value = $this->getValue();
7171
foreach ($this->_getOptions() as $option) {
7272
if (is_array($option['value'])) {

0 commit comments

Comments
 (0)