← All changes
|
build/scripts/style-engine/class-wp-style-engine-gutenberg.php
+2
-43
23.6.2
→
22.7.0
View file →
| @@ -72,20 +72,8 @@ | ||
| 72 | 72 | 'default' => 'background-attachment', |
| 73 | 73 | ), |
| 74 | 74 | 'path' => array( 'background', 'backgroundAttachment' ), |
| 75 | 75 | ), |
| 76 | - 'gradient' => array( | |
| 77 | - 'property_keys' => array( | |
| 78 | - 'default' => 'background-image', | |
| 79 | - ), | |
| 80 | - 'css_vars' => array( | |
| 81 | - 'gradient' => '--wp--preset--gradient--$slug', | |
| 82 | - ), | |
| 83 | - 'path' => array( 'background', 'gradient' ), | |
| 84 | - 'classnames' => array( | |
| 85 | - 'has-background' => true, | |
| 86 | - ), | |
| 87 | - ), | |
| 88 | 76 | ), |
| 89 | 77 | 'color' => array( |
| 90 | 78 | 'text' => array( |
| 91 | 79 | 'property_keys' => array( |
| @@ -227,23 +215,8 @@ | ||
| 227 | 215 | 'css_vars' => array( |
| 228 | 216 | 'dimension' => '--wp--preset--dimension--$slug', |
| 229 | 217 | ), |
| 230 | 218 | ), |
| 231 | - 'minWidth' => array( | |
| 232 | - 'property_keys' => array( | |
| 233 | - 'default' => 'min-width', | |
| 234 | - ), | |
| 235 | - 'path' => array( 'dimensions', 'minWidth' ), | |
| 236 | - 'css_vars' => array( | |
| 237 | - 'dimension' => '--wp--preset--dimension--$slug', | |
| 238 | - ), | |
| 239 | - ), | |
| 240 | - 'objectFit' => array( | |
| 241 | - 'property_keys' => array( | |
| 242 | - 'default' => 'object-fit', | |
| 243 | - ), | |
| 244 | - 'path' => array( 'dimensions', 'objectFit' ), | |
| 245 | - ), | |
| 246 | 219 | 'width' => array( |
| 247 | 220 | 'property_keys' => array( |
| 248 | 221 | 'default' => 'width', |
| 249 | 222 | ), |
| @@ -335,14 +308,8 @@ | ||
| 335 | 308 | 'default' => 'text-indent', |
| 336 | 309 | ), |
| 337 | 310 | 'path' => array( 'typography', 'textIndent' ), |
| 338 | 311 | ), |
| 339 | - 'textShadow' => array( | |
| 340 | - 'property_keys' => array( | |
| 341 | - 'default' => 'text-shadow', | |
| 342 | - ), | |
| 343 | - 'path' => array( 'typography', 'textShadow' ), | |
| 344 | - ), | |
| 345 | 312 | 'textTransform' => array( |
| 346 | 313 | 'property_keys' => array( |
| 347 | 314 | 'default' => 'text-transform', |
| 348 | 315 | ), |
| @@ -416,11 +383,10 @@ | ||
| 416 | 383 | * Stores a CSS rule using the provided CSS selector and CSS declarations. |
| 417 | 384 | * |
| 418 | 385 | * @param string $store_name A valid store key. |
| 419 | 386 | * @param string $css_selector When a selector is passed, the function will return a full CSS rule `$selector { ...rules }`, otherwise a concatenated string of properties and values. |
| 420 | - * @param string[]|WP_Style_Engine_CSS_Declarations_Gutenberg $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ), | |
| 421 | - * or a WP_Style_Engine_CSS_Declarations_Gutenberg object. | |
| 422 | - * @param string $rules_group Optional. A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`. | |
| 387 | + * @param string[] $css_declarations An associative array of CSS definitions, e.g., array( "$property" => "$value", "$property" => "$value" ). | |
| 388 | + * @param string $rules_group Optional. A parent CSS selector in the case of nested CSS, or a CSS nested @rule, such as `@media (min-width: 80rem)` or `@layer module`. | |
| 423 | 389 | * |
| 424 | 390 | * @return void. |
| 425 | 391 | */ |
| 426 | 392 | public static function store_css_rule( $store_name, $css_selector, $css_declarations, $rules_group = '' ) { |
| @@ -488,15 +454,8 @@ | ||
| 488 | 454 | } |
| 489 | 455 | |
| 490 | 456 | $css_declarations = static::get_css_declarations( $style_value, $style_definition, $options ); |
| 491 | 457 | if ( ! empty( $css_declarations ) ) { |
| 492 | - /* | |
| 493 | - * Combine background gradient and background image into a single | |
| 494 | - * comma-separated background-image value, matching the JS style engine. | |
| 495 | - */ | |
| 496 | - if ( isset( $css_declarations['background-image'] ) && isset( $parsed_styles['declarations']['background-image'] ) ) { | |
| 497 | - $css_declarations['background-image'] = $css_declarations['background-image'] . ', ' . $parsed_styles['declarations']['background-image']; | |
| 498 | - } | |
| 499 | 458 | $parsed_styles['declarations'] = array_merge( $parsed_styles['declarations'], $css_declarations ); |
| 500 | 459 | } |
| 501 | 460 | } |
| 502 | 461 | } |