| @@ -72,10 +72,11 @@ | ||
| 72 | 72 | wp_enqueue_style( 'wpbc-admin-listing-table', wpbc_plugin_url( '/core/any/css/admin-listing-table.css' ), array(), WP_BK_VERSION_NUM); |
| 73 | 73 | wp_enqueue_style( 'wpbc-br-table', wpbc_plugin_url( '/core/any/css/admin-br-table.css' ), array(), WP_BK_VERSION_NUM); |
| 74 | 74 | wp_enqueue_style( 'wpbc-flex-table', wpbc_plugin_url( '/core/any/css/wpbc_flextable.css' ), array(), WP_BK_VERSION_NUM); // Flex: Booking resources Table // FixIn: 9.9.0.7. |
| 75 | 75 | wp_enqueue_style( 'wpbc-admin-modal-popups', wpbc_plugin_url( '/css/modal.css' ), array(), WP_BK_VERSION_NUM); |
| 76 | - wp_enqueue_style( 'wpbc-admin-pages', wpbc_plugin_url( '/css/admin.css' ), array(), WP_BK_VERSION_NUM); | |
| 76 | + wp_enqueue_style( 'wpbc-admin-pages', wpbc_plugin_url( '/css/admin.css' ), array(), WP_BK_VERSION_NUM); | |
| 77 | 77 | wp_enqueue_style( 'wpbc-admin-skin', wpbc_plugin_url( '/css/admin-skin.css' ), array( 'wpbc-admin-pages' ), WP_BK_VERSION_NUM ); // FixIn: 8.0.2.4. |
| 78 | + wp_enqueue_style( 'wpbc-admin-components', wpbc_plugin_url( '/includes/_toolbar_ui/_out/wpbc_admin_components.css' ), array( 'wpbc-admin-skin' ), WP_BK_VERSION_NUM ); // Reusable components that must override legacy administration compatibility styles. | |
| 78 | 79 | |
| 79 | 80 | $wpbc_inline_css = ''; |
| 80 | 81 | if ( wpbc_mu__is_simulated_login_as_user() ) { |
| 81 | 82 | // Mark last item in menu as a button. |
| @@ -91,12 +92,9 @@ | ||
| 91 | 92 | |
| 92 | 93 | $server_request_uri = ( ( isset( $_SERVER['REQUEST_URI'] ) ) ? sanitize_text_field( $_SERVER['REQUEST_URI'] ) : '' ); /* phpcs:ignore WordPress.Security.NonceVerification.Missing, WordPress.Security.ValidatedSanitizedInput.MissingUnslash */ /* FixIn: sanitize_unslash */ |
| 93 | 94 | if ( |
| 94 | 95 | ( 'admin' !== $where_to_load ) || |
| 95 | - ( wpbc_is_new_booking_page() ) || | |
| 96 | - ( wpbc_is_setup_wizard_page() ) || | |
| 97 | - ( wpbc_is_settings_form_page() ) || | |
| 98 | - ( wpbc_is_settings_color_themes_page() ) || | |
| 96 | + ( wpbc_is_admin_page_with_frontend_booking_preview() ) || | |
| 99 | 97 | ( ( wpbc_is_settings_page() ) && ( strpos( $server_request_uri, 'tab=payment' ) !== false ) ) |
| 100 | 98 | ) { |
| 101 | 99 | wpbc_enqueue_styles__front_end(); |
| 102 | 100 | } |
| @@ -114,9 +112,8 @@ | ||
| 114 | 112 | wpbc_is_bookings_page() || |
| 115 | 113 | wpbc_is_new_booking_page() || |
| 116 | 114 | wpbc_is_setup_wizard_page() || |
| 117 | 115 | wpbc_is_settings_form_page() || |
| 118 | - wpbc_is_settings_color_themes_page() || | |
| 119 | 116 | wpbc_is_resources_page() || |
| 120 | 117 | wpbc_is_settings_page() |
| 121 | 118 | ) { |
| 122 | 119 | if ( function_exists( 'wp_dequeue_style' ) ) { |
| @@ -151,9 +148,9 @@ | ||
| 151 | 148 | */ |
| 152 | 149 | function wpbc_enqueue_styles__front_end() { |
| 153 | 150 | |
| 154 | 151 | // Client or Add New Booking page. |
| 155 | - if ( ( 'On' === get_bk_option( 'booking_timeslot_picker' ) ) || ( wpbc_is_setup_wizard_page() || wpbc_is_builder_booking_form_page() ) ) { // FixIn: 8.7.11.10. | |
| 152 | + if ( ( 'On' === get_bk_option( 'booking_timeslot_picker' ) ) || wpbc_is_setup_wizard_page() || wpbc_is_builder_booking_form_page() || wpbc_is_settings_themes_page() ) { // FixIn: 8.7.11.10. | |
| 156 | 153 | wp_enqueue_style( 'wpbc-time_picker', wpbc_plugin_url( '/css/wpbc_time-selector.css' ), array(), WP_BK_VERSION_NUM ); |
| 157 | 154 | |
| 158 | 155 | $time_picker_skin_path = wpbc_get_time_picker_skin_url(); |
| 159 | 156 | if ( ! empty( $time_picker_skin_path ) ) { |
| @@ -240,9 +237,9 @@ | ||
| 240 | 237 | $time_picker_skin_path = false; |
| 241 | 238 | |
| 242 | 239 | // Just default value, if previously was not saved any options. |
| 243 | 240 | if ( empty( get_bk_option( 'booking_timeslot_picker_skin' ) ) ) { |
| 244 | - update_bk_option( 'booking_timeslot_picker_skin', '/css/time_picker_skins/light__24_8.css' ); // FixIn: 10.4.0.1. | |
| 241 | + update_bk_option( 'booking_timeslot_picker_skin', '/css/time_picker_skins/form_style.css' ); // FixIn: 11.4.4. | |
| 245 | 242 | } |
| 246 | 243 | |
| 247 | 244 | // Check if this skin exist in the plugin folder. |
| 248 | 245 | if ( file_exists( WPBC_PLUGIN_DIR . str_replace( WPBC_PLUGIN_URL, '', get_bk_option( 'booking_timeslot_picker_skin' ) ) ) ) { |
