Merge remote-tracking branch 'origin/MC-14939' into 2.2.8-develop-pr79

viktorpetryk · viktorpetryk · commit 1bc8a1bc3941 · 2019-02-19T18:27:57.000+02:00
diff --git a/app/code/Magento/Ui/view/base/web/templates/form/field.html b/app/code/Magento/Ui/view/base/web/templates/form/field.html
@@ -8,7 +8,7 @@
      visible="visible"
      css="$data.additionalClasses"
      attr="'data-index': index">
-    <div class="admin__field-label">
+    <div class="admin__field-label" if="$data.label" visible="$data.labelVisible">
         <label if="$data.label" visible="$data.labelVisible"  attr="for: uid">
             <span translate="label" attr="'data-config-scope': $data.scopeLabel" />
         </label>
diff --git a/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less b/app/design/adminhtml/Magento/backend/web/css/source/forms/_fields.less
@@ -678,10 +678,13 @@
                 margin: 0;
                 opacity: 1;
                 position: static;
-                text-align: left;
             }
         }
 
+        .admin__field-label {
+            text-align: left;
+        }
+
         &:nth-child(n + 2) {
             &:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {
                 > .admin__field-label[class] {

Original file line number	Diff line number	Diff line change
`@@ -678,10 +678,13 @@`
`678`	`678`	`margin: 0;`
`679`	`679`	`opacity: 1;`
`680`	`680`	`position: static;`
`681`		`- text-align: left;`
`682`	`681`	`}`
`683`	`682`	`}`
`684`	`683`
	`684`	`+ .admin__field-label {`
	`685`	`+ text-align: left;`
	`686`	`+ }`
	`687`	`+`
`685`	`688`	`&:nth-child(n + 2) {`
`686`	`689`	`&:not(.admin__field-option):not(.admin__field-group-show-label):not(.admin__field-date) {`
`687`	`690`	`> .admin__field-label[class] {`