Skip to content

Commit 31af91c

Browse files
author
Momotenko,Natalia(nmomotenko)
committed
Merge pull request #290 from magento-webdev/PR-3
[WebDev] Tasks and Bugfixes
2 parents 8fa30ec + 6875cf9 commit 31af91c

File tree

26 files changed

+110
-49
lines changed

26 files changed

+110
-49
lines changed

‎app/code/Magento/Backend/Block/System/Account/Edit/Form.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ protected function _prepareForm()
100100
'name' => 'password',
101101
'label' => __('New Password'),
102102
'title' => __('New Password'),
103-
'class' => 'input-text validate-admin-password'
103+
'class' => 'validate-admin-password admin__control-text'
104104
]
105105
);
106106

@@ -110,7 +110,7 @@ protected function _prepareForm()
110110
[
111111
'name' => 'password_confirmation',
112112
'label' => __('Password Confirmation'),
113-
'class' => 'input-text validate-cpassword'
113+
'class' => 'validate-cpassword admin__control-text'
114114
]
115115
);
116116

@@ -138,7 +138,7 @@ protected function _prepareForm()
138138
'label' => __('Your Password'),
139139
'id' => self::IDENTITY_VERIFICATION_PASSWORD_FIELD,
140140
'title' => __('Your Password'),
141-
'class' => 'input-text validate-current-password required-entry',
141+
'class' => 'validate-current-password required-entry admin__control-text',
142142
'required' => true
143143
]
144144
);

‎app/code/Magento/Backend/etc/adminhtml/system.xml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,9 +164,10 @@
164164
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
165165
<comment>Warning! Enabling this feature is not recommended on production environments because it represents a potential security risk.</comment>
166166
</field>
167-
<field id="minify_html" translate="label" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
167+
<field id="minify_html" translate="label comment" type="select" sortOrder="25" showInDefault="1" showInWebsite="1" showInStore="1">
168168
<label>Minify Html</label>
169169
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
170+
<comment>Minification is not applied in developer mode.</comment>
170171
</field>
171172
</group>
172173
<group id="translate_inline" translate="label" type="text" sortOrder="30" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -193,9 +194,10 @@
193194
<label>Enable JavaScript Bundling</label>
194195
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
195196
</field>
196-
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
197+
<field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
197198
<label>Minify JavaScript Files</label>
198199
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
200+
<comment>Minification is not applied in developer mode.</comment>
199201
</field>
200202
</group>
201203
<group id="css" translate="label" type="text" sortOrder="110" showInDefault="1" showInWebsite="1" showInStore="1">
@@ -204,9 +206,10 @@
204206
<label>Merge CSS Files</label>
205207
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
206208
</field>
207-
<field id="minify_files" translate="label" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
209+
<field id="minify_files" translate="label comment" type="select" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1">
208210
<label>Minify CSS Files</label>
209211
<source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
212+
<comment>Minification is not applied in developer mode.</comment>
210213
</field>
211214
</group>
212215
<group id="image" translate="label" type="text" sortOrder="120" showInDefault="1" showInWebsite="0" showInStore="0">

‎app/code/Magento/Backend/view/adminhtml/templates/menu.phtml

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

99
?>
1010

11-
<nav data-mage-init='{"globalNavigation": {}}' class="admin__menu" role="navigation">
11+
<nav data-mage-init='{"globalNavigation": {}}' class="admin__menu">
1212
<?php /* @escapeNotVerified */ echo $block->renderNavigation($block->getMenuModel(), 0, 12); ?>
1313
</nav>
1414

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Advanced.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ protected function _prepareForm()
154154
'name' => 'is_unique',
155155
'label' => __('Unique Value'),
156156
'title' => __('Unique Value (not shared with other products)'),
157-
'note' => __('Not shared with other products'),
157+
'note' => __('Not shared with other products.'),
158158
'values' => $yesno
159159
]
160160
);
@@ -230,7 +230,7 @@ protected function _prepareForm()
230230
'name' => 'is_global',
231231
'label' => __('Scope'),
232232
'title' => __('Scope'),
233-
'note' => __('Declare attribute value saving scope'),
233+
'note' => __('Declare attribute value saving scope.'),
234234
'values' => $scopes
235235
],
236236
'attribute_code'

‎app/code/Magento/Catalog/Block/Adminhtml/Product/Attribute/Edit/Tab/Front.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ protected function _prepareForm()
164164
'name' => 'used_in_product_listing',
165165
'label' => __('Used in Product Listing'),
166166
'title' => __('Used in Product Listing'),
167-
'note' => __('Depends on design theme'),
167+
'note' => __('Depends on design theme.'),
168168
'values' => $yesnoSource
169169
]
170170
);
@@ -176,7 +176,7 @@ protected function _prepareForm()
176176
'name' => 'used_for_sort_by',
177177
'label' => __('Used for Sorting in Product Listing'),
178178
'title' => __('Used for Sorting in Product Listing'),
179-
'note' => __('Depends on design theme'),
179+
'note' => __('Depends on design theme.'),
180180
'values' => $yesnoSource
181181
]
182182
);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/** @var $block \Magento\Eav\Block\Adminhtml\Attribute\Edit\Options\Options */
1010
?>
1111
<fieldset class="fieldset">
12-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (values of your attribute)') ?></span></legend>
12+
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Options (Values of Your Attribute)') ?></span></legend>
1313
<div id="manage-options-panel">
1414
<table class="admin__control-table">
1515
<thead>

‎app/code/Magento/ConfigurableProduct/view/adminhtml/templates/catalog/product/edit/attribute/steps/bulk.phtml

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

1212
<div data-bind="scope: '<?= /* @escapeNotVerified */ $block->getComponentName()?>'" data-role="bulk-step">
13-
<h2 class="steps-wizard-title"><?= /* @escapeNotVerified */ __('Step 3: Bulk Images, Price, and Quantity') ?></h2>
13+
<h2 class="steps-wizard-title"><?= /* @escapeNotVerified */ __('Step 3: Bulk Images, Price and Quantity') ?></h2>
1414
<div class="steps-wizard-info">
1515
<?= /* @escapeNotVerified */ __('Based on your selections <span class="new-products-count" data-bind="text:countVariations"></span>
1616
new products will be created. Use this step to customize images and price for your new products.') ?>

‎app/code/Magento/Eav/Block/Adminhtml/Attribute/Edit/Main/AbstractMain.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ protected function _prepareForm()
131131
'text',
132132
[
133133
'name' => 'frontend_label[0]',
134-
'label' => __('Default label'),
134+
'label' => __('Default Label'),
135135
'title' => __('Default label'),
136136
'required' => true,
137137
'value' => is_array($labels) ? $labels[0] : $labels
@@ -235,7 +235,7 @@ protected function _prepareForm()
235235
'name' => 'is_unique',
236236
'label' => __('Unique Value'),
237237
'title' => __('Unique Value (not shared with other products)'),
238-
'note' => __('Not shared with other products'),
238+
'note' => __('Not shared with other products.'),
239239
'values' => $yesno
240240
]
241241
);

‎app/code/Magento/Eav/Block/Adminhtml/Attribute/Grid/AbstractGrid.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ protected function _prepareColumns()
5353
$this->addColumn(
5454
'frontend_label',
5555
[
56-
'header' => __('Default label'),
56+
'header' => __('Default Label'),
5757
'sortable' => true,
5858
'index' => 'frontend_label',
5959
'header_css_class' => 'col-label',

‎app/code/Magento/LayeredNavigation/Observer/Edit/Tab/Front/ProductAttributeFormBuildFrontTabObserver.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
5555
'name' => 'is_filterable',
5656
'label' => __("Use in Layered Navigation"),
5757
'title' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
58-
'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
58+
'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price.'),
5959
'values' => [
6060
['value' => '0', 'label' => __('No')],
6161
['value' => '1', 'label' => __('Filterable (with results)')],
@@ -71,7 +71,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
7171
'name' => 'is_filterable_in_search',
7272
'label' => __("Use in Search Results Layered Navigation"),
7373
'title' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
74-
'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price'),
74+
'note' => __('Can be used only with catalog input type Dropdown, Multiple Select and Price.'),
7575
'values' => $this->optionList->toOptionArray(),
7676
]
7777
);
@@ -83,7 +83,7 @@ public function execute(\Magento\Framework\Event\Observer $observer)
8383
'name' => 'position',
8484
'label' => __('Position'),
8585
'title' => __('Position in Layered Navigation'),
86-
'note' => __('Position of attribute in layered navigation block'),
86+
'note' => __('Position of attribute in layered navigation block.'),
8787
'class' => 'validate-digits'
8888
]
8989
);

‎app/code/Magento/Sales/view/frontend/templates/reorder/sidebar.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<div class="block block-reorder" data-bind="scope: 'lastOrderedItems'">
1616
<div class="block-title no-display"
1717
data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}">
18-
<strong id="block-reorder-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('My Orders') ?></strong>
18+
<strong id="block-reorder-heading" role="heading" aria-level="2"><?php /* @escapeNotVerified */ echo __('Recently Ordered') ?></strong>
1919
</div>
2020
<div class="block-content no-display"
2121
data-bind="css: {'no-display': !lastOrderedItems().items || lastOrderedItems().items.length === 0}"

‎app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/text.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Text */
1010
?>
1111
<fieldset class="fieldset">
12-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (values of your attribute)') ?></span></legend>
12+
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (Values of Your Attribute)') ?></span></legend>
1313
<div id="swatch-text-options-panel">
1414
<table class="data-table clearfix" cellspacing="0">
1515
<thead>

‎app/code/Magento/Swatches/view/adminhtml/templates/catalog/product/attribute/visual.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
/** @var $block \Magento\Swatches\Block\Adminhtml\Attribute\Edit\Options\Visual */
1010
?>
1111
<fieldset class="fieldset">
12-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (values of your attribute)') ?></span></legend>
12+
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Manage Swatch (Values of Your Attribute)') ?></span></legend>
1313
<div id="swatch-visual-options-panel">
1414
<table class="data-table clearfix" cellspacing="0">
1515
<thead>

‎app/code/Magento/Theme/view/frontend/templates/html/skiptarget.phtml

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

99
$target_id = $block->getTargetId();
1010
?>
11-
<a id="<?php /* @escapeNotVerified */ echo $target_id?>" name="<?php /* @escapeNotVerified */ echo $target_id?>" tabindex="-1"></a>
11+
<a id="<?php /* @escapeNotVerified */ echo $target_id?>" tabindex="-1"></a>

‎app/code/Magento/Theme/view/frontend/templates/html/topmenu.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<?php $columnsLimit = $block->getColumnsLimit() ?: 0; ?>
1818
<?php $_menu = $block->getHtml('level-top', 'submenu', $columnsLimit) ?>
1919

20-
<nav class="navigation" role="navigation">
20+
<nav class="navigation" data-action="navigation">
2121
<ul data-mage-init='{"menu":{"responsive":true, "expanded":true, "position":{"my":"left top","at":"left bottom"}}}'>
2222
<?php /* @escapeNotVerified */ echo $_menu; ?>
2323
</ul>

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -469,6 +469,16 @@
469469
content: @icon-systems__content;
470470
}
471471
}
472+
473+
&._current {
474+
+ .item-partners {
475+
> a {
476+
&:after {
477+
display: none;
478+
}
479+
}
480+
}
481+
}
472482
}
473483

474484
.item-partners {

‎app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/main/_actions-bar.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
position: fixed;
4848
right: 0;
4949
top: 0;
50-
z-index: @page-actions__fixed__z-index;
50+
z-index: @page-actions__fixed__z-index + 1;
5151

5252
.page-actions-inner {
5353
&:before {

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/_module-old.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
}
9494

9595
.col-name {
96-
position: relative;
96+
background-clip: padding-box; // Firefox missing border fix
9797
}
9898

9999
.action-choose {

‎app/design/adminhtml/Magento/backend/Magento_ConfigurableProduct/web/css/source/module/steps/_bulk-images.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@
216216
}
217217

218218
.file-row {
219+
border: 0;
219220
height: 100%;
220221
position: absolute;
221222
width: 100%;

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,9 +61,9 @@
6161
}
6262

6363
.data-grid-cell-content {
64+
display: inline-block;
6465
overflow: hidden;
6566
width: 100%;
66-
display: inline-block;
6767
}
6868

6969
body._in-resize {

‎app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/data-grid/data-grid-header/_data-grid-sticky-header.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
.admin__data-grid-header-row {
4444
position: relative;
4545
text-align: right;
46+
4647
&:last-child {
4748
margin: 0;
4849
}

‎app/design/adminhtml/Magento/backend/web/css/source/forms/controls/_checkbox-radio.less

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
display: inline-block;
2626

2727
&:before {
28-
&:extend(.abs-icon all);
2928
background-color: @control-checkbox-radio__background-color;
3029
border: 1px solid @field-control__border-color;
3130
color: transparent;
@@ -100,8 +99,7 @@
10099
+ label {
101100
&:before {
102101
border-radius: @control-checkbox-radio__size;
103-
content: @icon-dot__content;
104-
font-size: 1rem;
102+
content: '';
105103
transition: @smooth__border-color, color .1s ease-in;
106104
}
107105
}
@@ -117,6 +115,21 @@
117115

118116
// Radio checked state
119117
&:checked {
118+
+ label {
119+
position: relative;
120+
121+
&:after {
122+
background-color: @control-checkbox-radio-mark__color;
123+
border-radius: 50%;
124+
content: '';
125+
height: 10px;
126+
left: 3px;
127+
position: absolute;
128+
top: 4px;
129+
width: 10px;
130+
}
131+
}
132+
120133
&:not([disabled]),
121134
&:not(.disabled) {
122135
// Prevent hover effects for checked radio
@@ -139,6 +152,7 @@
139152
.admin__control-checkbox {
140153
+ label {
141154
&:before {
155+
&:extend(.abs-icon all);
142156
border-radius: 1px;
143157
content: '';
144158
font-size: 0;

0 commit comments

Comments
 (0)