ENGCOM-3324: Fixed 18918 Asterisk sign display twice #18922

magento-engcom-team · magento-engcom-team · commit 4f3d55eebca5 · 2018-11-29T12:06:22.000-06:00
- Merge Pull Request #18922 from suryakant-krish/magento2:Fixed-18918 - Merged commits: 1. 9fbf41a 2. fd9a423 3. 7365f5f 4. c870f0d 5. 1197845 6. c230c7e
diff --git a/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less b/app/design/adminhtml/Magento/backend/Magento_Backend/web/css/source/module/_menu.less
@@ -273,7 +273,16 @@
             > .submenu {
                 transform: translateX(0);
                 visibility: visible;
-                z-index: @submenu__z-index;
+                z-index: 698;
+                overflow-x: scroll;
+                min-height: 98.65%;
+                left: 0;
+                position: absolute;
+                left: 100%;
+                min-width: 100%;
+                display: block;
+                float: left;
+                max-width: 1640px;
             }
         }
     }
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
@@ -59,11 +59,7 @@
 }
 
 .abs-field-no-label {
-    /**
-     * @codingStandardsIgnoreStart
-     */
     #mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');
-    //@codingStandardsIgnoreEnd
     margin-left: @_length;
 }
 
@@ -170,13 +166,6 @@
     .admin__control-text,
     .admin__control-textarea {
         width: 100%;
-        &.disabled {
-            background-color: #e9e9e9;
-            border-color: #adadad;
-            color: #303030;
-            cursor: not-allowed;
-            opacity: .5;
-        }
     }
 }
 
@@ -194,13 +183,10 @@
 
 .admin__field-label {
     color: @field-label__color;
+    cursor: pointer;
     margin: 0;
     text-align: right;
 
-    label {
-        cursor: pointer;
-    }
-
     + br {
         display: none;
     }
@@ -251,6 +237,7 @@
                 margin-top: .2rem;
                 position: absolute;
                 z-index: 1;
+                
             }
         }
     }
@@ -296,6 +283,14 @@
             opacity: 1;
         }
     }
+    
+    legend.admin__field-label{
+        span {
+            &:after {
+                display: none;
+            } 
+        }
+    }
 
     //  ToDo UI: Scope Labels must be moved from right side of each control to the place under the label of the control.
     //  This code must be removed after Scope Labels are moved completely.

Original file line number	Diff line number	Diff line change
`@@ -273,7 +273,16 @@`
`273`	`273`	`> .submenu {`
`274`	`274`	`transform: translateX(0);`
`275`	`275`	`visibility: visible;`
`276`		`- z-index: @submenu__z-index;`
	`276`	`+ z-index: 698;`
	`277`	`+ overflow-x: scroll;`
	`278`	`+ min-height: 98.65%;`
	`279`	`+ left: 0;`
	`280`	`+ position: absolute;`
	`281`	`+ left: 100%;`
	`282`	`+ min-width: 100%;`
	`283`	`+ display: block;`
	`284`	`+ float: left;`
	`285`	`+ max-width: 1640px;`
`277`	`286`	`}`
`278`	`287`	`}`
`279`	`288`	`}`
Original file line number	Diff line number	Diff line change
`@@ -59,11 +59,7 @@`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`.abs-field-no-label {`
`62`		`- /**`
`63`		`- * @codingStandardsIgnoreStart`
`64`		`- */`
`65`	`62`	`#mix-grid .return_length(@field-label-grid__column, @field-grid__columns, '+');`
`66`		`- //@codingStandardsIgnoreEnd`
`67`	`63`	`margin-left: @_length;`
`68`	`64`	`}`
`69`	`65`
`@@ -170,13 +166,6 @@`
`170`	`166`	`.admin__control-text,`
`171`	`167`	`.admin__control-textarea {`
`172`	`168`	`width: 100%;`
`173`		`- &.disabled {`
`174`		`- background-color: #e9e9e9;`
`175`		`- border-color: #adadad;`
`176`		`- color: #303030;`
`177`		`- cursor: not-allowed;`
`178`		`- opacity: .5;`
`179`		`- }`
`180`	`169`	`}`
`181`	`170`	`}`
`182`	`171`
`@@ -194,13 +183,10 @@`
`194`	`183`
`195`	`184`	`.admin__field-label {`
`196`	`185`	`color: @field-label__color;`
	`186`	`+ cursor: pointer;`
`197`	`187`	`margin: 0;`
`198`	`188`	`text-align: right;`
`199`	`189`
`200`		`- label {`
`201`		`- cursor: pointer;`
`202`		`- }`
`203`		`-`
`204`	`190`	`+ br {`
`205`	`191`	`display: none;`
`206`	`192`	`}`
`@@ -251,6 +237,7 @@`
`251`	`237`	`margin-top: .2rem;`
`252`	`238`	`position: absolute;`
`253`	`239`	`z-index: 1;`
	`240`	`+`
`254`	`241`	`}`
`255`	`242`	`}`
`256`	`243`	`}`
`@@ -296,6 +283,14 @@`
`296`	`283`	`opacity: 1;`
`297`	`284`	`}`
`298`	`285`	`}`
	`286`	`+`
	`287`	`+ legend.admin__field-label{`
	`288`	`+ span {`
	`289`	`+ &:after {`
	`290`	`+ display: none;`
	`291`	`+ }`
	`292`	`+ }`
	`293`	`+ }`
`299`	`294`
`300`	`295`	`// ToDo UI: Scope Labels must be moved from right side of each control to the place under the label of the control.`
`301`	`296`	`// This code must be removed after Scope Labels are moved completely.`