Merge remote-tracking branch 'origin/MAGETWO-37696' into PR

Author: Natalia Momotenko

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

@@ -89,15 +89,16 @@ public function getValuesHtml()
                     $type = 'radio';
                     $class = 'radio admin__control-radio';
                     if (!$_option->getIsRequire()) {
-                        $selectHtml .= '<div class="field admin__field choice"><input type="radio" id="options_' .
+                        $selectHtml .= '<div class="field choice admin__field admin__field-option">' .
+                            '<input type="radio" id="options_' .
                             $_option->getId() .
                             '" class="' .
                             $class .
                             ' product-custom-option" name="options[' .
                             $_option->getId() .
                             ']"' .
                             ($this->getSkipJsReloadPrice() ? '' : ' onclick="opConfig.reloadPrice()"') .
-                            ' value="" checked="checked" /><label class="label" for="options_' .
+                            ' value="" checked="checked" /><label class="label admin__field-label" for="options_' .
                             $_option->getId() .
                             '"><span>' .
                             __('None') . '</span></label></div>';
@@ -153,7 +154,7 @@ public function getValuesHtml()
                     ' price="' .
                     $this->pricingHelper->currencyByStore($_value->getPrice(true), $store, false) .
                     '" />' .
-                    '<label class="label" for="options_' .
+                    '<label class="label admin__field-label" for="options_' .
                     $_option->getId() .
                     '_' .
                     $count .

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

@@ -517,3 +517,10 @@ label.mage-error {
         padding-right: 1.8rem;
     }
 }
+
+.product-configure-popup {
+    .time-picker {
+        display: block;
+        margin-top: 1rem;
+    }
+}