fix: compress rgba() colors in gradient, like rgb() colors

Cerdic · Sep 21, 2023 · 187b973 · 187b973
1 parent 827f92e
commit 187b973
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/class.csstidy_optimise.php b/class.csstidy_optimise.php
@@ -320,7 +320,7 @@ public function cut_color($color) {
 			// on ne touche pas aux couleurs dans les expression ms, c'est trop sensible
 			if (stripos($color, 'progid:') !== false)
 				return $color;
-			preg_match_all(",rgb\([^)]+\),i", $color, $matches, PREG_SET_ORDER);
+			preg_match_all(",rgba?\([^)]+\),i", $color, $matches, PREG_SET_ORDER);
 			if (count($matches)) {
 				foreach ($matches as $m) {
 					$color = str_replace($m[0], $this->cut_color($m[0]), $color);

diff --git a/testing/unit-tests/csst/properties/preserve-merging-rtl.csst b/testing/unit-tests/csst/properties/preserve-merging-rtl.csst
@@ -18,12 +18,12 @@ array (
   ),
   '.gradient' => 
   array (
-    'background-image' => '-webkit-gradient(linear,right bottom,right top,color-stop(0.15,rgba(215,240,240,0.9)),color-stop(0.5,rgba(235,250,250,0)))',
-    'background-image ' => '-moz-linear-gradient(bottom,rgba(215,240,240,0.9),rgba(235,250,250,0)) #ebf7f9',
+    'background-image' => '-webkit-gradient(linear,right bottom,right top,color-stop(0.15,#d7f0f0e6),color-stop(0.5,#ebfafa00))',
+    'background-image ' => '-moz-linear-gradient(bottom,#d7f0f0e6,#ebfafa00) #ebf7f9',
   ),
 )
 --SETTINGS--
 discard_invalid_properties=false
 reverse_left_and_right=true
 optimise_shorthands=0
-css_level='CSS21'
+css_level='CSS21'
diff --git a/testing/unit-tests/csst/properties/preserve-merging.csst b/testing/unit-tests/csst/properties/preserve-merging.csst
@@ -18,11 +18,11 @@ array (
   ),
   '.gradient' => 
   array (
-    'background-image' => '-webkit-gradient(linear,left bottom,left top,color-stop(0.15,rgba(215,240,240,0.9)),color-stop(0.5,rgba(235,250,250,0)))',
-    'background-image ' => '-moz-linear-gradient(bottom,rgba(215,240,240,0.9),rgba(235,250,250,0)) #ebf7f9',
+    'background-image' => '-webkit-gradient(linear,left bottom,left top,color-stop(0.15,#d7f0f0e6),color-stop(0.5,#ebfafa00))',
+    'background-image ' => '-moz-linear-gradient(bottom,#d7f0f0e6,#ebfafa00) #ebf7f9',
   ),
 )
 --SETTINGS--
 discard_invalid_properties=false
 optimise_shorthands=0
-css_level='CSS21'
+css_level='CSS21'
diff --git a/testing/unit-tests/csst/vendor-prefixed/webkit-gradient.csst b/testing/unit-tests/csst/vendor-prefixed/webkit-gradient.csst
@@ -15,7 +15,7 @@ array (
 	),
 	'.radial' =>
 	array (
-		'background' => '-webkit-gradient(radial,45 45,10,52 50,30,from(#A7D30C),to(rgba(1,159,98,0)),color-stop(90%,#019F62))',
+		'background' => '-webkit-gradient(radial,45 45,10,52 50,30,from(#A7D30C),to(#019f6200),color-stop(90%,#019F62))',
 	),
 )
 --SETTINGS--