ENGCOM-1810: [Forwardport] Resolved : UI Component listing action column outside of screen when... #15746

Stanislav Idolov · Stanislav Idolov · commit 8f9f37451038 · 2018-06-06T12:43:13.000+03:00
diff --git a/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less b/app/design/adminhtml/Magento/backend/Magento_Ui/web/css/source/module/_data-grid.less
@@ -236,7 +236,7 @@ body._in-resize {
 
     th,
     td {
-        font-size: @data-grid__font-size; // ToDo UI: Rewrite old styles. Should be deleted afterwards
+        font-size: @data-grid__font-size; // Rewrite old styles. Should be deleted afterwards
         line-height: @line-height__base;
         transition: @smooth__background-color;
         vertical-align: top;
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/ClassNamingSniff.php
@@ -62,11 +62,5 @@ public function process(File $phpcsFile, $stackPtr)
         if (preg_match_all('/[^a-z0-9\-_]/U', $className, $matches)) {
             $phpcsFile->addError('Class name contains not allowed symbols', $stackPtr, 'NotAllowedSymbol', $matches);
         }
-
-        if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX) !== false
-            && strpos($className, self::STRING_ALLOWED_UNDERSCORES) === false
-        ) {
-            $phpcsFile->addError('"_" symbol allowed only for helper classes', $stackPtr, 'UnderscoreSymbol');
-        }
     }
 }
diff --git a/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php b/dev/tests/static/framework/Magento/Sniffs/Less/PropertiesSortingSniff.php
@@ -101,7 +101,7 @@ public function process(File $phpcsFile, $stackPtr)
     private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties)
     {
         // Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.
-        $symbolsForSkip = ['(', 'block'];
+        $symbolsForSkip = ['(', 'block', 'field'];
         $properties = array_filter(
             $properties,
             function ($var) use ($symbolsForSkip) {

Original file line number	Diff line number	Diff line change
`@@ -62,11 +62,5 @@ public function process(File $phpcsFile, $stackPtr)`
`62`	`62`	`if (preg_match_all('/[^a-z0-9\-_]/U', $className, $matches)) {`
`63`	`63`	`$phpcsFile->addError('Class name contains not allowed symbols', $stackPtr, 'NotAllowedSymbol', $matches);`
`64`	`64`	`}`
`65`		`-`
`66`		`- if (strpos($className, self::STRING_HELPER_CLASSES_PREFIX) !== false`
`67`		`- && strpos($className, self::STRING_ALLOWED_UNDERSCORES) === false`
`68`		`- ) {`
`69`		`- $phpcsFile->addError('"_" symbol allowed only for helper classes', $stackPtr, 'UnderscoreSymbol');`
`70`		`- }`
`71`	`65`	`}`
`72`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public function process(File $phpcsFile, $stackPtr)`
`101`	`101`	`private function validatePropertiesSorting(File $phpcsFile, $stackPtr, array $properties)`
`102`	`102`	`{`
`103`	`103`	`// Fix needed for cases when incorrect properties passed for validation due to bug in PHP tokens.`
`104`		`- $symbolsForSkip = ['(', 'block'];`
	`104`	`+ $symbolsForSkip = ['(', 'block', 'field'];`
`105`	`105`	`$properties = array_filter(`
`106`	`106`	`$properties,`
`107`	`107`	`function ($var) use ($symbolsForSkip) {`