Skip to content

Commit 4822bb1

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #14714: [Forwardport] 6879 - Unable to change country of manufacture default label value (by @rostyslav-hymon) - #14679: [Forwardport] Checkout page - Fix tooltip position on mobile devices (by @ihor-sviziev) Fixed GitHub Issues: - #6879: Unable to change country of manufacture default label value (reported by @wujashek) has been fixed in #14714 by @rostyslav-hymon in 2.3-develop branch Related commits: 1. 5a2e819 2. 156dcc0
2 parents 7dbf9cb + 2003550 commit 4822bb1

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

app/design/frontend/Magento/blank/web/css/source/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1233,7 +1233,7 @@
12331233
}
12341234
}
12351235

1236-
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
1236+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
12371237
.abs-checkout-tooltip-content-position-top-mobile {
12381238
@abs-checkout-tooltip-content-position-top();
12391239
}

app/design/frontend/Magento/luma/web/css/source/_extends.less

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1681,7 +1681,7 @@
16811681
}
16821682
}
16831683

1684-
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = (@screen__m + 1)) {
1684+
.media-width(@extremum, @break) when (@extremum = 'max') and (@break = @screen__m) {
16851685
.abs-checkout-tooltip-content-position-top-mobile {
16861686
@abs-checkout-tooltip-content-position-top();
16871687
}

lib/web/mage/validation.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,9 @@
195195
var empty = $(element).closest('table')
196196
.find('input.required-option:visible')
197197
.filter(function (i, el) {
198-
return $.mage.isEmpty(el.value);
198+
if ($(el).is('disabled')) {
199+
return $.mage.isEmpty(el.value);
200+
}
199201
})
200202
.length;
201203

0 commit comments

Comments
 (0)