Skip to content

Commit 7673c14

Browse files
author
Korshenko, Olexii(okorshenko)
committed
Merge pull request #708 from magento-webdev/PR-2
[WebDev] Bugfixes
2 parents 0e5d78e + bc9bdea commit 7673c14

File tree

33 files changed

+424
-469
lines changed

33 files changed

+424
-469
lines changed

‎app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ if (!isset($advancedLabel)) {
2222
$advancedLabel = __('Additional Settings');
2323
}
2424

25-
$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset ' . $element->getClass();
25+
$cssClass = ($isField) ? 'field ' . $element->getClass() : 'fieldset admin__fieldset' . $element->getClass();
2626

2727
if ($isField) {
2828
$count = $element->getCountBasicChildren();
@@ -91,11 +91,11 @@ if ($isField) {
9191

9292
<?php if ($element->hasAdvanced() && !$isField): ?>
9393
<?php echo(!$element->getNoContainer() && $advancedAfter) ? '</fieldset>' : ''?>
94-
<details data-mage-init='{"details": {}}' class="details" id="details<?php /* @escapeNotVerified */ echo $id ?>">
95-
<summary class="details-summary" id="details-summary<?php /* @escapeNotVerified */ echo $id ?>">
94+
<details data-mage-init='{"details": {}}' class="details admin__collapsible-block-wrapper" id="details<?php /* @escapeNotVerified */ echo $id ?>">
95+
<summary class="details-summary admin__collapsible-title" id="details-summary<?php /* @escapeNotVerified */ echo $id ?>">
9696
<span><?php /* @escapeNotVerified */ echo $advancedLabel ?></span>
9797
</summary>
98-
<div class="details-content" id="details-content<?php /* @escapeNotVerified */ echo $id ?>">
98+
<div class="details-content admin__fieldset" id="details-content<?php /* @escapeNotVerified */ echo $id ?>">
9999
<?php echo $element->getAdvancedChildrenHtml(); ?>
100100
</div>
101101
</details>

‎app/code/Magento/Bundle/view/base/templates/product/price/tier_prices.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $tierPriceModel = $block->getPrice();
1616
$tierPrices = $tierPriceModel->getTierPriceList();
1717
?>
1818
<?php if (count($tierPrices)) : ?>
19-
<ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices tier items'); ?>">
19+
<ul class="<?php /* @escapeNotVerified */ echo($block->hasListClass() ? $block->getListClass() : 'prices-tier items'); ?>">
2020
<?php foreach ($tierPrices as $index => $price) : ?>
2121
<li class="item">
2222
<?php /* @escapeNotVerified */ echo __(

‎app/code/Magento/Catalog/view/adminhtml/web/product/product.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -325,6 +325,7 @@
325325

326326
.admin__scope-old .tiers_table .col-qty span {
327327
font-size: 1rem;
328+
white-space: nowrap;
328329
}
329330

330331
.admin__scope-old .tiers_table .col-price .input-text {

‎app/code/Magento/Checkout/view/frontend/web/js/model/shipping-rates-validator.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,14 @@ define(
8181
var countryId = $('select[name="shippingAddress[country_id]"]').val();
8282
var validationResult = postcodeValidator.validate(postcodeElement.value(), countryId);
8383

84-
postcodeElement.error(null);
84+
postcodeElement.warn(null);
8585
if (!validationResult) {
86-
var errorMessage = $t('Invalid Zip/Postal code for current country!');
86+
var warnMessage = $t('Provided Zip/Postal Code seems to be invalid.');
8787
if (postcodeValidator.validatedPostCodeExample.length) {
88-
errorMessage += $t(' Example: ') + postcodeValidator.validatedPostCodeExample.join('; ');
88+
warnMessage += $t(' Example: ') + postcodeValidator.validatedPostCodeExample.join('; ') + '. ';
8989
}
90-
postcodeElement.error(errorMessage);
90+
warnMessage += $t('If you believe it is the right one you can ignore this notice.');
91+
postcodeElement.warn(warnMessage);
9192
}
9293
return validationResult;
9394
},

‎app/code/Magento/TaxImportExport/view/adminhtml/templates/importExport.phtml

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,16 @@
1111
<?php if (!$block->getIsReadonly()): ?>
1212
<div class="import-tax-rates">
1313
<?php if ($block->getUseContainer()): ?>
14-
<form id="import-form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
14+
<form id="import-form" class="admin__fieldset" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/importPost') ?>" method="post" enctype="multipart/form-data">
1515
<?php endif; ?>
1616
<?php echo $block->getBlockHtml('formkey')?>
17-
<fieldset class="fieldset">
18-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Import Tax Rates') ?></span></legend>
19-
<input type="file" name="import_rates_file" class="input-file required-entry"/>
20-
<?php echo $block->getButtonHtml('Import Tax Rates', '', 'import-submit') ?>
21-
</fieldset>
17+
<div class="fieldset admin__field">
18+
<label for="import_rates_file" class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Import Tax Rates') ?></span></label>
19+
<div class="admin__field-control">
20+
<input type="file" id="import_rates_file" name="import_rates_file" class="input-file required-entry"/>
21+
<?php echo $block->getButtonHtml('Import Tax Rates', '', 'import-submit') ?>
22+
</div>
23+
</div>
2224
<?php if ($block->getUseContainer()): ?>
2325
</form>
2426
<?php endif; ?>
@@ -44,13 +46,15 @@ require(['jquery', "mage/mage", "loadingPopup"], function(jQuery){
4446
<?php endif; ?>
4547
<div class="export-tax-rates <?php if ($block->getIsReadonly()): ?>box-left<?php else: ?>box-right<?php endif; ?>">
4648
<?php if ($block->getUseContainer()): ?>
47-
<form id="export_form" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
49+
<form id="export_form" class="admin__fieldset" action="<?php /* @escapeNotVerified */ echo $block->getUrl('tax/rate/exportPost') ?>" method="post" enctype="multipart/form-data">
4850
<?php endif; ?>
4951
<?php echo $block->getBlockHtml('formkey')?>
50-
<fieldset class="fieldset">
51-
<legend class="legend"><span><?php /* @escapeNotVerified */ echo __('Export Tax Rates') ?></span></legend>
52-
<?php echo $block->getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
53-
</fieldset>
52+
<div class="fieldset admin__field">
53+
<span class="admin__field-label"><span><?php /* @escapeNotVerified */ echo __('Export Tax Rates') ?></span></span>
54+
<div class="admin__field-control">
55+
<?php echo $block->getButtonHtml('Export Tax Rates', "this.form.submit()") ?>
56+
</div>
57+
</div>
5458
<?php if ($block->getUseContainer()): ?>
5559
</form>
5660
<?php endif; ?>

‎app/code/Magento/Ui/view/base/web/js/form/element/abstract.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ define([
2525
description: '',
2626
label: '',
2727
error: '',
28+
warn: '',
2829
notice: '',
2930
customScope: '',
3031
additionalClasses: {},
@@ -64,7 +65,7 @@ define([
6465

6566
this._super();
6667

67-
this.observe('error disabled focused preview visible value')
68+
this.observe('error disabled focused preview visible value warn')
6869
.observe({
6970
'required': !!rules['required-entry']
7071
});
@@ -126,6 +127,7 @@ define([
126127
_.extend(this.additionalClasses, {
127128
required: this.required,
128129
_error: this.error,
130+
_warn: this.warn,
129131
_disabled: this.disabled
130132
});
131133

‎app/code/Magento/Ui/view/frontend/web/templates/form/field.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,10 @@
4242
<!-- ko if: element.error() -->
4343
<div class="mage-error" data-bind="attr: { for: element.uid }, text: element.error" generated="true"></div>
4444
<!-- /ko -->
45+
46+
<!-- ko if: element.warn() -->
47+
<div class="message warning" generated="true"><span data-bind="text: element.warn"></span></div>
48+
<!-- /ko -->
4549
</div>
4650
</div>
4751
<!-- /ko -->

‎app/design/adminhtml/Magento/backend/Magento_Tax/web/css/source/_module.less

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,7 @@
77
-webkit-appearance: none;
88
&:extend(.action-default, button all);
99
}
10+
11+
.import-export-tax-rates {
12+
padding-top: @indent__base;
13+
}

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
background-color: @btn-prime__background-color;
104104
color: @btn-prime__color;
105105
text-shadow: 1px 1px 0 rgba(0, 0, 0, .25);
106+
&:focus,
106107
&:hover {
107108
.lib-background-gradient(
108109
@_background-gradient: true,
@@ -158,7 +159,6 @@
158159
.ie9 & {
159160
background-color: @btn-secondary__disabled__background-color;
160161
}
161-
&:hover,
162162
&:active {
163163
.ie9 & {
164164
background-color: @btn-secondary__disabled__background-color;
@@ -200,6 +200,7 @@
200200
left: 100%;
201201
margin-left: -@triangle__base__size + .1;
202202
}
203+
&:focus,
203204
&:hover {
204205
&:after {
205206
border-left-color: @btn__base__hover__background-color;
@@ -224,6 +225,7 @@
224225
border-color: transparent transparent transparent @btn__base__disabled__background-color;
225226
}
226227
}
228+
&:focus,
227229
&:hover,
228230
&:active {
229231
&:after {
@@ -239,6 +241,7 @@
239241
&:after {
240242
border-color: transparent transparent transparent @btn-prime__background-color;
241243
}
244+
&:focus,
242245
&:hover {
243246
&:after {
244247
border-left-color: @btn-prime__color-gradient-end;
@@ -288,6 +291,7 @@
288291
margin-right: -@triangle__base__size + .1;
289292
right: 100%;
290293
}
294+
&:focus,
291295
&:hover {
292296
&:after {
293297
border-right-color: @btn__base__hover__background-color;
@@ -326,6 +330,7 @@
326330
&:after {
327331
border-color: transparent @btn-prime__background-color transparent transparent;
328332
}
333+
&:focus,
329334
&:hover {
330335
&:after {
331336
border-right-color: @btn-prime__color-gradient-start;

‎app/design/adminhtml/Magento/backend/web/app/updater/styles/less/components/_header.less

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,9 @@
2929
left: @page-header__indent-horizontal;
3030
position: absolute;
3131
right: @page-header__indent-horizontal;
32+
.container & {
33+
content: normal;
34+
}
3235
}
3336
.message {
3437
margin-bottom: 1.8rem;
@@ -40,8 +43,16 @@
4043
.admin__action-dropdown {
4144
transition: none;
4245
}
46+
.container & {
47+
margin-bottom: 0;
48+
}
4349
}
4450

4551
.page-title-wrapper {
4652
margin-top: 1.1rem;
53+
.container & {
54+
background: url('@{path-to-pub}images/logo.svg') no-repeat 0 0;
55+
min-height: 41px;
56+
padding: 4px 0 0 45px;
57+
}
4758
}

0 commit comments

Comments
 (0)