Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Backport] Fix #21648 Checkout Agreements checkbox missing asterisk #21838

Merged
merged 4 commits into from
Mar 20, 2019
Merged

[Backport] Fix #21648 Checkout Agreements checkbox missing asterisk #21838

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
079ecb3
remove refactored code
Karlasa Mar 8, 2019
943fb33
fix asterisk
Karlasa Mar 8, 2019
745df9a
add choice class
Karlasa Mar 13, 2019
8c609c4
fix choice aligment
Karlasa Mar 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...e/Magento/CheckoutAgreements/view/frontend/web/template/checkout/checkout-agreements.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
*/
-->
<div data-role="checkout-agreements">
<div class="checkout-agreements" data-bind="visible: isVisible">
<div class="checkout-agreements fieldset" data-bind="visible: isVisible">
<!-- ko foreach: agreements -->
<!-- ko if: ($parent.isAgreementRequired($data)) -->
<div class="checkout-agreement required">
<div class="checkout-agreement field choice required">
<input type="checkbox" class="required-entry"
data-bind="attr: {
'id': $parent.getCheckboxId($parentContext, agreementId),
'name': 'agreement[' + agreementId + ']',
'value': agreementId
}"/>
<label data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
<label class="label" data-bind="attr: {'for': $parent.getCheckboxId($parentContext, agreementId)}">
<button type="button"
class="action action-show"
data-bind="click: function(data, event) { return $parent.showContent(data, event) }"
Expand Down
28 changes: 0 additions & 28 deletions ...esign/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_fields.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,31 +55,3 @@
}
}
}

//
// Desktop
// _____________________________________________

.media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
// ToDo UI: remove with global blank theme .field.required update
.opc-wrapper {
.fieldset {
> .field {
&.required,
&._required {
position: relative;

> label {
padding-right: 25px;

&:after {
margin-left: @indent__s;
position: absolute;
top: 9px;
}
}
}
}
}
}
}
7 changes: 7 additions & 0 deletions ...ign/frontend/Magento/blank/Magento_Checkout/web/css/source/module/checkout/_payments.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,6 +209,13 @@
.fieldset {
> .field {
margin: 0 0 @indent__base;

&.choice {
&:before {
padding: 0;
width: 0;
}
}

&.type {
.control {
Expand Down