Skip to content

Commit a55c94f

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #21782: Edited headings to be more consistent (by @mikeshatch) - #21649: Fix #21648 Checkout Agreements checkbox missing asterisk (by @Karlasa) - #18633: Fix for issue #18630 (by @dverkade) Fixed GitHub Issues: - #21648: Checkout Agreements checkbox missing asterisk (reported by @Karlasa) has been fixed in #21649 by @Karlasa in 2.3-develop branch Related commits: 1. e6167ad 2. afa0320 3. 92d93f5 4. 46bbdd0 5. a39e221 - #18630: Postcode / Zipcode in checkout form already validated on page load (reported by @dverkade) has been fixed in #18633 by @dverkade in 2.3-develop branch Related commits: 1. bf024c1 2. df90f67 3. 6257fe8 4. ac11b34
2 parents 3666e03 + 1c98757 commit a55c94f

File tree

5 files changed

+36
-37
lines changed

5 files changed

+36
-37
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
<h2>Welcome</h2>
66
Welcome to Magento 2 installation! We're glad you chose to install Magento 2, a cutting-edge, feature-rich eCommerce solution that gets results.
77

8-
## Magento system requirements
9-
[Magento system requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
8+
## Magento System Requirements
9+
[Magento System Requirements](https://devdocs.magento.com/guides/v2.3/install-gde/system-requirements2.html).
1010

1111
## Install Magento
1212

13-
* [Installation guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
13+
* [Installation Guide](https://devdocs.magento.com/guides/v2.3/install-gde/bk-install-guide.html).
1414

15-
<h2>Contributing to the Magento 2 code base</h2>
15+
<h2>Contributing to the Magento 2 Code Base</h2>
1616
Contributions can take the form of new components or features, changes to existing features, tests, documentation (such as developer guides, user guides, examples, or specifications), bug fixes, optimizations, or just good suggestions.
1717

1818
To learn about how to make a contribution, click [here][1].
@@ -39,11 +39,11 @@ Magento is thankful for any contribution that can improve our code base, documen
3939
<img src="https://raw.githubusercontent.com/wiki/magento/magento2/images/contributors.png"/>
4040
</a>
4141

42-
### Labels applied by the Magento team
42+
### Labels Applied by the Magento Team
4343
We apply labels to public Pull Requests and Issues to help other participants retrieve additional information about current progress, component assignments, Magento release lines, and much more.
4444
Please review the [Code Contributions guide](https://devdocs.magento.com/guides/v2.3/contributor-guide/contributing.html#labels) for detailed information on labels used in Magento 2 repositories.
4545

46-
## Reporting security issues
46+
## Reporting Security Issues
4747

4848
To report security vulnerabilities in Magento software or web sites, please create a Bugcrowd researcher account [there](https://bugcrowd.com/magento) to submit and follow-up your issue. Learn more about reporting security issues [here](https://magento.com/security/reporting-magento-security-issue).
4949

app/code/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,17 @@
55
*/
66
-->
77
<div data-role="checkout-agreements">
8-
<div class="checkout-agreements" data-bind="visible: isVisible">
8+
<div class="checkout-agreements fieldset" data-bind="visible: isVisible">
99
<!-- ko foreach: agreements -->
1010
<!-- ko if: ($parent.isAgreementRequired($data)) -->
11-
<div class="checkout-agreement required">
11+
<div class="checkout-agreement field choice required">
1212
<input type="checkbox" class="required-entry"
1313
data-bind="attr: {
1414
'id': $parent.getCheckboxId($parentContext, agreementId),
1515
'name': 'agreement[' + agreementId + ']',
1616
'value': agreementId
1717
}"/>
18-
<label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
18+
<label class="label" data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
1919
<button type="button"
2020
class="action action-show"
2121
data-bind="click: function(data, event) { return $parent.showContent(data, event) }"

app/code/Magento/Ui/view/base/web/js/form/element/post-code.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,26 @@ define([
2020
}
2121
},
2222

23+
/**
24+
* Initializes observable properties of instance
25+
*
26+
* @returns {Abstract} Chainable.
27+
*/
28+
initObservable: function () {
29+
this._super();
30+
31+
/**
32+
* equalityComparer function
33+
*
34+
* @returns boolean.
35+
*/
36+
this.value.equalityComparer = function (oldValue, newValue) {
37+
return !oldValue && !newValue || oldValue === newValue;
38+
};
39+
40+
return this;
41+
},
42+
2343
/**
2444
* @param {String} value
2545
*/

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -55,31 +55,3 @@
5555
}
5656
}
5757
}
58-
59-
//
60-
// Desktop
61-
// _____________________________________________
62-
63-
.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
64-
// ToDo UI: remove with global blank theme .field.required update
65-
.opc-wrapper {
66-
.fieldset {
67-
> .field {
68-
&.required,
69-
&._required {
70-
position: relative;
71-
72-
> label {
73-
padding-right: 25px;
74-
75-
&:after {
76-
margin-left: @indent__s;
77-
position: absolute;
78-
top: 9px;
79-
}
80-
}
81-
}
82-
}
83-
}
84-
}
85-
}

app/design/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -209,6 +209,13 @@
209209
.fieldset {
210210
> .field {
211211
margin: 0 0 @indent__base;
212+
213+
&.choice {
214+
&:before {
215+
padding: 0;
216+
width: 0;
217+
}
218+
}
212219

213220
&.type {
214221
.control {

0 commit comments

Comments
 (0)