@@ -109,7 +109,7 @@ public static function css ($string="") {
109
109
"/(\[)([^ \"' \]]+)([ \"'])([^ \"' \]]+)( \\3)(\])/ " ,
110
110
"/ (\!important)/ " ,
111
111
"/\:(\:before|\:after)/ " ,
112
- "/ ?([\(\) \{\}\:\;\,]) / " ,
112
+ "/([ \{\}\:\;\,]) / " ,
113
113
"/(margin|padding|border-width|border-color|border-style)\:([0-9a-z\.\-\%]+)(\s+ \\2)*([!;}])/i " ,
114
114
"/(margin|padding|border-width|border-color|border-style)\:([0-9a-z\.\-\%]+)(\s+[0-9a-z\.\-\%]+)(\s+ \\2)( \\3)*([!;}])/i "
115
115
),
@@ -129,7 +129,7 @@ public static function css ($string="") {
129
129
'$1$2$4$6 ' ,
130
130
'$1 ' ,
131
131
'$1 ' ,
132
- '$1 ' ,
132
+ '$1 ' ,
133
133
'$1:$2$4 ' ,
134
134
'$1:$2$3$6 '
135
135
),
@@ -138,10 +138,10 @@ public static function css ($string="") {
138
138
$ string = preg_replace_callback ('/\:\s*calc\(([^;}]+)/ ' , function ($ m ) {
139
139
return preg_replace (array ('/\s+/ ' , '/([-+*\/]+)/ ' ), array ('' , ' $1 ' ), $ m [0 ]);
140
140
}, $ string );
141
- $ string = preg_replace_callback ('/(.)(rgba?|hsla?)\s*\(\s*(\d+)[, %]+(\d+)[, %]+(\d+)[, %]*([01]?)\s*\)(.) / ' , function ($ m ) {
142
- if ($ m [6 ] === '0 ' ) return $ m [1 ].'transparent ' . $ m [ 7 ] ;
141
+ $ string = preg_replace_callback ('/(.)(rgba?|hsla?)\s*\(\s*(\d+)[, %]+(\d+)[, %]+(\d+)[, %]*([01]?)\s*\)/ ' , function ($ m ) {
142
+ if ($ m [6 ] === '0 ' ) return $ m [1 ].'transparent ' ;
143
143
$ type = str_replace ('a ' , '' , strtolower ($ m [2 ]));
144
- return $ m [1 ].($ type == 'hsl ' ? self ::hsl2hex ($ m [3 ]*1 , $ m [4 ]*1 , $ m [5 ]*1 ) : self ::rgb2hex ($ m [3 ]*1 , $ m [4 ]*1 , $ m [5 ]*1 )). $ m [ 7 ] ;
144
+ return $ m [1 ].($ type == 'hsl ' ? self ::hsl2hex ($ m [3 ]*1 , $ m [4 ]*1 , $ m [5 ]*1 ) : self ::rgb2hex ($ m [3 ]*1 , $ m [4 ]*1 , $ m [5 ]*1 ));
145
145
}, $ string );
146
146
$ string = preg_replace ("/([,: \(]#)([0-9a-f]) \\2([0-9a-f]) \\3([0-9a-f]) \\4/i " , '$1$2$3$4 ' , $ string );
147
147
return trim ($ string );
0 commit comments