Skip to content

Commit f212d65

Browse files
committed
Merge remote-tracking branch 'mainline/develop' into API-Sprint41-Bugs
2 parents db3b997 + f94717b commit f212d65

File tree

1,135 files changed

+16153
-14851
lines changed

Some content is hidden

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

1,135 files changed

+16153
-14851
lines changed

Gruntfile.js

Lines changed: 415 additions & 105 deletions
Large diffs are not rendered by default.

app/code/Magento/Backend/Block/System/Design/Edit/Tab/General.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected function _prepareForm()
100100
'label' => __('Date From'),
101101
'title' => __('Date From'),
102102
'name' => 'date_from',
103-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
103+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
104104
'date_format' => $dateFormat
105105
//'required' => true
106106
]
@@ -112,7 +112,7 @@ protected function _prepareForm()
112112
'label' => __('Date To'),
113113
'title' => __('Date To'),
114114
'name' => 'date_to',
115-
'image' => $this->getViewFileUrl('images/grid-cal.gif'),
115+
'image' => $this->getViewFileUrl('images/grid-cal.png'),
116116
'date_format' => $dateFormat
117117
//'required' => true
118118
]

app/code/Magento/Backend/Block/Widget/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ protected function _applyTypeSpecificConfig($inputType, $element, \Magento\Eav\M
226226
$element->setCanBeEmpty(true);
227227
break;
228228
case 'date':
229-
$element->setImage($this->getViewFileUrl('images/grid-cal.gif'));
229+
$element->setImage($this->getViewFileUrl('images/grid-cal.png'));
230230
$element->setDateFormat($this->_localeDate->getDateFormatWithLongYear());
231231
break;
232232
case 'multiline':

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ public function getHtml()
9999
'",
100100
buttonImage: "' .
101101
$this->getViewFileUrl(
102-
'images/grid-cal.gif'
102+
'images/grid-cal.png'
103103
) . '",
104104
buttonText: "' . $this->escapeHtml(__('Date selector')) .
105105
'",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function getHtml()
139139
dateFormat: "' . $format . '",
140140
timeFormat: "' . $timeFormat . '",
141141
showsTime: ' . ($this->getColumn()->getFilterTime() ? 'true' : 'false') . ',
142-
buttonImage: "' . $this->getViewFileUrl('images/grid-cal.gif') . '",
142+
buttonImage: "' . $this->getViewFileUrl('images/grid-cal.png') . '",
143143
buttonText: "' . $this->escapeHtml(__('Date selector')) . '",
144144
from: {
145145
id: "' . $htmlId . '_from"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Binary file not shown.
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading
Loading
Loading
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)