diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php index 8cf98be294f97..cd5c0a2247f10 100644 --- a/app/code/Magento/Backend/Block/Store/Switcher.php +++ b/app/code/Magento/Backend/Block/Store/Switcher.php @@ -548,11 +548,11 @@ public function getHintHtml() $html = ''; $url = $this->getHintUrl(); if ($url) { - $html = '
' . '' . '' . __( + ) . '"' . ' class="admin__field-tooltip-action action-help">' . __( 'What is this?' ) . '' . '
'; } diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml index 64d4ca68e905c..2a58b93944892 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset.phtml @@ -13,13 +13,13 @@ getNoContainer()): ?> -
+
getLegend()): ?> - + getLegend() ?> - +
getHeaderBar() ?> getHintHtml() ?> diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml index 24369768eb088..22661e67952d9 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher/form/renderer/fieldset/element.phtml @@ -14,10 +14,10 @@ $note = $element->getNote() ? '
' . $element->getNote() . 'getExtType() == 'checkbox' || $element->getExtType() == 'radio'; $addOn = $element->getBeforeElementHtml() || $element->getAfterElementHtml(); $fieldId = ($element->getHtmlContainerId()) ? ' id="' . $element->getHtmlContainerId() . '"' : ''; -$fieldClass = "field field-{$element->getId()} {$element->getCssClass()}"; +$fieldClass = "admin__field field field-{$element->getId()} {$element->getCssClass()}"; $fieldClass .= ($elementBeforeLabel) ? ' choice' : ''; $fieldClass .= ($addOn) ? ' with-addon' : ''; -$fieldClass .= ($element->getRequired()) ? ' required' : ''; +$fieldClass .= ($element->getRequired()) ? ' _required' : ''; $fieldClass .= ($note) ? ' with-note' : ''; $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' @@ -35,8 +35,9 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" ' getLabelHtml() ?> -
+
' . $element->getElementHtml() . '
' : $element->getElementHtml(); ?> + getHintHtml() ?>
@@ -44,7 +45,6 @@ $fieldAttributes = $fieldId . ' class="' . $fieldClass . '" '
- getHintHtml() ?>
diff --git a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml index 620c8195006da..b8c14ed801a4b 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/widget/form/renderer/fieldset.phtml @@ -57,7 +57,7 @@ if ($isField) { getNoContainer()): ?>
getLegend() && !$isWrapped): ?> - + getLegend() ?>
diff --git a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml index f995ee8214169..0360288380c3b 100644 --- a/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml +++ b/app/code/Magento/Catalog/view/frontend/templates/product/view/addto.phtml @@ -18,13 +18,11 @@ $compareHelper = $this->helper('Magento\Catalog\Helper\Product\Compare'); helper('Magento\Wishlist\Helper\Data')->isAllow()) : ?>