| @@ -1,13 +1,14 @@ | ||
| 1 | 1 | <?php |
| 2 | 2 | namespace Elementor\Core\Editor; |
| 3 | 3 | |
| 4 | 4 | use Elementor\Api; |
| 5 | +use Elementor\Core\Breakpoints\Breakpoint; | |
| 6 | +use Elementor\Core\Breakpoints\Manager as Breakpoints_Manager; | |
| 5 | 7 | use Elementor\Core\Common\Modules\Ajax\Module; |
| 6 | 8 | use Elementor\Core\Common\Modules\Ajax\Module as Ajax; |
| 7 | 9 | use Elementor\Core\Debug\Loading_Inspection_Manager; |
| 8 | 10 | use Elementor\Core\Files\Assets\Files_Upload_Handler; |
| 9 | -use Elementor\Core\Responsive\Responsive; | |
| 10 | 11 | use Elementor\Core\Schemes\Manager as Schemes_Manager; |
| 11 | 12 | use Elementor\Core\Settings\Manager as SettingsManager; |
| 12 | 13 | use Elementor\Icons_Manager; |
| 13 | 14 | use Elementor\Plugin; |
| @@ -558,9 +559,8 @@ | ||
| 558 | 559 | 'tools_page_link' => Tools::get_url(), |
| 559 | 560 | 'elementor_site' => 'https://go.elementor.com/about-elementor/', |
| 560 | 561 | 'docs_elementor_site' => 'https://go.elementor.com/docs/', |
| 561 | 562 | 'help_the_content_url' => 'https://go.elementor.com/the-content-missing/', |
| 562 | - 'help_right_click_url' => 'https://go.elementor.com/meet-right-click/', | |
| 563 | 563 | 'help_flexbox_bc_url' => 'https://go.elementor.com/flexbox-layout-bc/', |
| 564 | 564 | 'elementPromotionURL' => 'https://go.elementor.com/go-pro-%s', |
| 565 | 565 | 'dynamicPromotionURL' => 'https://go.elementor.com/go-pro-dynamic-tag', |
| 566 | 566 | 'additional_shapes' => Shapes::get_additional_shapes_for_config(), |
| @@ -718,12 +718,16 @@ | ||
| 718 | 718 | $ui_theme_media_queries |
| 719 | 719 | ); |
| 720 | 720 | } |
| 721 | 721 | |
| 722 | - if ( Responsive::has_custom_breakpoints() ) { | |
| 723 | - $breakpoints = Responsive::get_breakpoints(); | |
| 722 | + $breakpoints = Plugin::$instance->breakpoints->get_breakpoints(); | |
| 724 | 723 | |
| 725 | - wp_add_inline_style( 'elementor-editor', '.elementor-device-tablet #elementor-preview-responsive-wrapper { width: ' . $breakpoints['md'] . 'px; }' ); | |
| 724 | + // The two breakpoints under 'tablet' need to be checked for values. | |
| 725 | + if ( $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE ]->is_custom() || $breakpoints[ Breakpoints_Manager::BREAKPOINT_KEY_MOBILE_EXTRA ]->is_enabled() ) { | |
| 726 | + wp_add_inline_style( | |
| 727 | + 'elementor-editor', | |
| 728 | + '.elementor-device-tablet #elementor-preview-responsive-wrapper { width: ' . Plugin::$instance->breakpoints->get_device_min_breakpoint( Breakpoints_Manager::BREAKPOINT_KEY_TABLET ) . 'px; }' | |
| 729 | + ); | |
| 726 | 730 | } |
| 727 | 731 | |
| 728 | 732 | /** |
| 729 | 733 | * After editor enqueue styles. |
| @@ -1036,8 +1040,9 @@ | ||
| 1036 | 1040 | 'repeater', |
| 1037 | 1041 | 'templates', |
| 1038 | 1042 | 'navigator', |
| 1039 | 1043 | 'hotkeys', |
| 1044 | + 'responsive-bar', | |
| 1040 | 1045 | ]; |
| 1041 | 1046 | |
| 1042 | 1047 | foreach ( $template_names as $template_name ) { |
| 1043 | 1048 | Plugin::$instance->common->add_template( ELEMENTOR_PATH . "includes/editor-templates/$template_name.php" ); |