Skip to content

Commit fd9e67a

Browse files
YevSentYevSent
committed
Merge branch 'develop' of github.corp.magento.com:magento2/magento2ce into MPI-PR
2 parents 56db8b8 + 32e7ab6 commit fd9e67a

File tree

218 files changed

+3969
-3821
lines changed

Some content is hidden

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

218 files changed

+3969
-3821
lines changed

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Most.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,14 @@ protected function _prepareColumns()
8080

8181
$this->addColumn(
8282
'orders_count',
83-
['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
83+
[
84+
'header' => __('Orders'),
85+
'sortable' => false,
86+
'index' => 'orders_count',
87+
'type' => 'number',
88+
'header_css_class' => 'col-orders',
89+
'column_css_class' => 'col-orders'
90+
]
8491
);
8592

8693
$baseCurrencyCode = (string)$this->_storeManager->getStore(

‎app/code/Magento/Backend/Block/Dashboard/Tab/Customers/Newest.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,14 @@ protected function _prepareColumns()
7878

7979
$this->addColumn(
8080
'orders_count',
81-
['header' => __('Orders'), 'sortable' => false, 'index' => 'orders_count', 'type' => 'number']
81+
[
82+
'header' => __('Orders'),
83+
'sortable' => false,
84+
'index' => 'orders_count',
85+
'type' => 'number',
86+
'header_css_class' => 'col-orders',
87+
'column_css_class' => 'col-orders'
88+
]
8289
);
8390

8491
$baseCurrencyCode = (string)$this->_storeManager->getStore(

‎app/code/Magento/Backend/view/adminhtml/templates/page/copyright.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,4 @@
88

99
?>
1010
<a class="link-copyright" href="http://magento.com" target="_blank" title="<?php /* @escapeNotVerified */ echo __('Magento') ?>"></a>
11-
<?php /* @escapeNotVerified */ echo __('Copyright&copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>
11+
<?php /* @escapeNotVerified */ echo __('Copyright &copy; %1 Magento Commerce Inc. All rights reserved.', date('Y')) ?>

‎app/code/Magento/Backend/view/adminhtml/web/template/dynamic-rows/grid.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@
55
*/
66
-->
77

8-
<div class="admin_field-complex" if="element.addButton">
9-
<div class="admin_field-complex-title">
8+
<div class="admin__field-complex" if="element.addButton">
9+
<div class="admin__field-complex-title">
1010
<span class="label" translate="'User Agent Rules'"></span>
1111
</div>
1212

13-
<div class="admin_field-complex-elements">
13+
<div class="admin__field-complex-elements">
1414
<render args="fallbackResetTpl" if="$data.showFallbackReset && $data.isDifferedFromDefault"/>
1515
<button attr="{disabled: disabled}"
1616
class="action-secondary"
@@ -20,7 +20,7 @@
2020
</button>
2121
</div>
2222

23-
<div class="admin_field-complex-content"
23+
<div class="admin__field-complex-content"
2424
translate="'User agent exceptions override product and CMS pages rules.'"></div>
2525
</div>
2626

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Attributes.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ private function customizeAddAttributeModal(array $meta)
149149
'arguments' => [
150150
'data' => [
151151
'config' => [
152-
'additionalClasses' => 'admin_field-complex-attributes',
152+
'additionalClasses' => 'admin__field-complex-attributes',
153153
'formElement' => Container::NAME,
154154
'componentType' => Container::NAME,
155155
'content' => __('Select Attribute'),

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/attribute/form.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php echo $block->getButtonsHtml('header') ?>
1818
</div>
1919

20-
<form id="edit_form" class="admin__scope-old" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
20+
<form id="edit_form" class="admin__scope-old edit-form" action="<?php echo $block->escapeHtml($block->getSaveUrl()) ?>" method="post">
2121
<input name="form_key" type="hidden" value="<?php echo $block->escapeHtml($block->getFormKey()) ?>" />
2222
<?php echo $block->getChildHtml('form') ?>
2323
</form>

‎app/code/Magento/GiftMessage/view/adminhtml/templates/popup.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
?>
1010

1111
<?php if ($block->getChildHtml()) :?>
12-
<div id="gift_options_configure_new" class="gift_options-popup product-configure-popup" style="display: none;">
12+
<div id="gift_options_configure_new" class="gift-options-popup product-configure-popup" style="display: none;">
1313
<div id="gift_options_form_contents">
1414
<div class="content">
1515
<?php echo $block->getChildHtml();?>

‎app/code/Magento/ProductVideo/Block/Adminhtml/Product/Edit/NewVideo.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ protected function _prepareForm()
150150
'new_video_screenshot_preview',
151151
'button',
152152
[
153-
'class' => 'preview_hidden_image_input_button',
153+
'class' => 'preview-image-hidden-input',
154154
'label' => '',
155155
'name' => '_preview',
156156
]
@@ -232,7 +232,7 @@ protected function getProduct()
232232
*/
233233
protected function addMediaRoleAttributes(Fieldset $fieldset)
234234
{
235-
$fieldset->addField('roleLabel', 'note', ['text' => __('Role')]);
235+
$fieldset->addField('role-label', 'note', ['text' => __('Role')]);
236236
$mediaRoles = $this->getProduct()->getMediaAttributes();
237237
ksort($mediaRoles);
238238
foreach ($mediaRoles as $mediaRole) {

‎app/code/Magento/Review/Block/Adminhtml/Add/Form.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ protected function _prepareForm()
6363
$fieldset->addField('product_name', 'note', ['label' => __('Product'), 'text' => 'product_name']);
6464

6565
$fieldset->addField(
66-
'detailed_rating',
66+
'detailed-rating',
6767
'note',
6868
[
6969
'label' => __('Product Rating'),

‎app/code/Magento/Review/Block/Adminhtml/Edit/Form.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ protected function _prepareForm()
128128
$fieldset->addField('customer', 'note', ['label' => __('Author'), 'text' => $customerText]);
129129

130130
$fieldset->addField(
131-
'summary_rating',
131+
'summary-rating',
132132
'note',
133133
[
134134
'label' => __('Summary Rating'),
@@ -137,7 +137,7 @@ protected function _prepareForm()
137137
);
138138

139139
$fieldset->addField(
140-
'detailed_rating',
140+
'detailed-rating',
141141
'note',
142142
[
143143
'label' => __('Detailed Rating'),

0 commit comments

Comments
 (0)