| @@ -287,12 +287,46 @@ | ||
| 287 | 287 | 'narrow' => __( 'Narrow', 'elementor' ), |
| 288 | 288 | 'extended' => __( 'Extended', 'elementor' ), |
| 289 | 289 | 'wide' => __( 'Wide', 'elementor' ), |
| 290 | 290 | 'wider' => __( 'Wider', 'elementor' ), |
| 291 | + 'custom' => __( 'Custom', 'elementor' ), | |
| 291 | 292 | ], |
| 292 | 293 | ] |
| 293 | 294 | ); |
| 294 | 295 | |
| 296 | + $this->add_responsive_control( | |
| 297 | + 'gap_columns_custom', | |
| 298 | + [ | |
| 299 | + 'label' => __( 'Custom Columns Gap', 'elementor' ), | |
| 300 | + 'type' => Controls_Manager::SLIDER, | |
| 301 | + 'range' => [ | |
| 302 | + 'px' => [ | |
| 303 | + 'min' => 0, | |
| 304 | + 'max' => 500, | |
| 305 | + ], | |
| 306 | + '%' => [ | |
| 307 | + 'min' => 0, | |
| 308 | + 'max' => 100, | |
| 309 | + ], | |
| 310 | + 'vh' => [ | |
| 311 | + 'min' => 0, | |
| 312 | + 'max' => 100, | |
| 313 | + ], | |
| 314 | + 'vw' => [ | |
| 315 | + 'min' => 0, | |
| 316 | + 'max' => 100, | |
| 317 | + ], | |
| 318 | + ], | |
| 319 | + 'size_units' => [ 'px', '%', 'vh', 'vw' ], | |
| 320 | + 'selectors' => [ | |
| 321 | + '{{WRAPPER}} .elementor-column-gap-custom > .elementor-column > .elementor-element-populated' => 'padding: {{SIZE}}{{UNIT}};', | |
| 322 | + ], | |
| 323 | + 'condition' => [ | |
| 324 | + 'gap' => 'custom', | |
| 325 | + ], | |
| 326 | + ] | |
| 327 | + ); | |
| 328 | + | |
| 295 | 329 | $this->add_control( |
| 296 | 330 | 'height', |
| 297 | 331 | [ |
| 298 | 332 | 'label' => __( 'Height', 'elementor' ), |
| @@ -399,10 +433,11 @@ | ||
| 399 | 433 | ], |
| 400 | 434 | ] |
| 401 | 435 | ); |
| 402 | 436 | |
| 403 | - $is_legacy_mode_active = Plugin::instance()->get_legacy_mode( 'elementWrappers' ); | |
| 404 | - $content_position_selector = $is_legacy_mode_active ? '{{WRAPPER}} > .elementor-container > .elementor-row > .elementor-column > .elementor-column-wrap > .elementor-widget-wrap' : '{{WRAPPER}} > .elementor-container > .elementor-column > .elementor-widget-wrap'; | |
| 437 | + $content_position_selector = Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ? | |
| 438 | + '{{WRAPPER}} > .elementor-container > .elementor-column > .elementor-widget-wrap' : | |
| 439 | + '{{WRAPPER}} > .elementor-container > .elementor-row > .elementor-column > .elementor-column-wrap > .elementor-widget-wrap'; | |
| 405 | 440 | |
| 406 | 441 | $this->add_control( |
| 407 | 442 | 'content_position', |
| 408 | 443 | [ |
| @@ -1393,9 +1428,9 @@ | ||
| 1393 | 1428 | <div class="elementor-background-overlay"></div> |
| 1394 | 1429 | <div class="elementor-shape elementor-shape-top"></div> |
| 1395 | 1430 | <div class="elementor-shape elementor-shape-bottom"></div> |
| 1396 | 1431 | <div class="elementor-container elementor-column-gap-{{ settings.gap }}"> |
| 1397 | - <?php if ( Plugin::instance()->get_legacy_mode( 'elementWrappers' ) ) { ?> | |
| 1432 | + <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?> | |
| 1398 | 1433 | <div class="elementor-row"></div> |
| 1399 | 1434 | <?php } ?> |
| 1400 | 1435 | </div> |
| 1401 | 1436 | <?php |
| @@ -1458,9 +1493,9 @@ | ||
| 1458 | 1493 | $this->print_shape_divider( 'bottom' ); |
| 1459 | 1494 | } |
| 1460 | 1495 | ?> |
| 1461 | 1496 | <div class="elementor-container elementor-column-gap-<?php echo esc_attr( $settings['gap'] ); ?>"> |
| 1462 | - <?php if ( Plugin::instance()->get_legacy_mode( 'elementWrappers' ) ) { ?> | |
| 1497 | + <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?> | |
| 1463 | 1498 | <div class="elementor-row"> |
| 1464 | 1499 | <?php } |
| 1465 | 1500 | } |
| 1466 | 1501 | |
| @@ -1473,9 +1508,9 @@ | ||
| 1473 | 1508 | * @access public |
| 1474 | 1509 | */ |
| 1475 | 1510 | public function after_render() { |
| 1476 | 1511 | ?> |
| 1477 | - <?php if ( Plugin::instance()->get_legacy_mode( 'elementWrappers' ) ) { ?> | |
| 1512 | + <?php if ( ! Plugin::$instance->experiments->is_feature_active( 'e_dom_optimization' ) ) { ?> | |
| 1478 | 1513 | </div> |
| 1479 | 1514 | <?php } ?> |
| 1480 | 1515 | </div> |
| 1481 | 1516 | </<?php echo esc_html( $this->get_html_tag() ); ?>> |