Skip to content

Commit 6451425

Browse files
author
Natalia Momotenko
committed
Merge remote-tracking branch 'origin/MAGETWO-37696' into PR
2 parents 63d8f8c + a9561bf commit 6451425

File tree

2 files changed

+11
-3
lines changed
  • app
    • code/Magento/Catalog/Block/Product/View/Options/Type
    • design/adminhtml/Magento/backend/web/css/source/forms

2 files changed

+11
-3
lines changed

app/code/Magento/Catalog/Block/Product/View/Options/Type/Select.php

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,15 +89,16 @@ public function getValuesHtml()
8989
$type = 'radio';
9090
$class = 'radio admin__control-radio';
9191
if (!$_option->getIsRequire()) {
92-
$selectHtml .= '<div class="field admin__field choice"><input type="radio" id="options_' .
92+
$selectHtml .= '<div class="field choice admin__field admin__field-option">' .
93+
'<input type="radio" id="options_' .
9394
$_option->getId() .
9495
'" class="' .
9596
$class .
9697
' product-custom-option" name="options[' .
9798
$_option->getId() .
9899
']"' .
99100
($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
100-
' value="" checked="checked" /><label class="label" for="options_' .
101+
' value="" checked="checked" /><label class="label admin__field-label" for="options_' .
101102
$_option->getId() .
102103
'"><span>' .
103104
__('None') . '</span></label></div>';
@@ -153,7 +154,7 @@ public function getValuesHtml()
153154
' price="' .
154155
$this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
155156
'" />' .
156-
'<label class="label" for="options_' .
157+
'<label class="label admin__field-label" for="options_' .
157158
$_option->getId() .
158159
'_' .
159160
$count .

app/design/adminhtml/Magento/backend/web/css/source/forms/_temp.less

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,3 +517,10 @@ label.mage-error {
517517
padding-right: 1.8rem;
518518
}
519519
}
520+
521+
.product-configure-popup {
522+
.time-picker {
523+
display: block;
524+
margin-top: 1rem;
525+
}
526+
}

0 commit comments

Comments
 (0)