Happy blocks: Remove temporary happy blocks code (Automattic#79916)

sirino · Jul 27, 2023 · 0c27453 · 0c27453
1 parent c4f3af0
commit 0c27453
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 24 deletions.
diff --git a/apps/happy-blocks/block-library/universal-header/includes.php b/apps/happy-blocks/block-library/universal-header/includes.php
@@ -26,6 +26,3 @@ function wpcom_navbar_get_assets( $file ) {
 
 wp_enqueue_style( 'wpsupport3-wpcom-navbar-search-style', $wpcom_nav_bar_css['path'], array(), $wpcom_nav_bar_css['version'] );
 wp_enqueue_script( 'wpsupport3-wpcom-navbar-search-script', $wpcom_nav_bar_js['path'], array(), $wpcom_nav_bar_js['version'], true );
-
-// Temporary load styles from education header.
-require_once WP_CONTENT_DIR . '/a8c-plugins/happy-blocks/block-library/education-header/includes.php';
diff --git a/apps/happy-blocks/block-library/universal-header/index.php b/apps/happy-blocks/block-library/universal-header/index.php
@@ -15,8 +15,8 @@
 if ( ! isset( $args ) ) {
 	$args = array();
 }
-$happy_blocks_is_english   = ( 0 === stripos( get_locale(), 'en' ) );
-$happy_blocks_current_page = $args['active_page'];
+$happy_blocks_is_english = ( 0 === stripos( get_locale(), 'en' ) );
+
 ?>
 <div id="lpc-header-nav" class="lpc lpc-header-nav">
 	<div class="x-root lpc-header-nav-wrapper">
@@ -539,22 +539,3 @@ class="x-icon x-icon--external" role="img" aria-hidden="true" focusable="false">
 		</div>
 	</div>
 </div>
-<!-- temporary -->
-<div class="universal-header-temporary-wpcom-nav-bar happy-blocks-mini-search happy-blocks-header is-<?php echo esc_html( $happy_blocks_current_page ); ?>">
-	<div class="happy-blocks-search-container">
-		<div class="happy-blocks-global-header-site__title">
-			<?php if ( $args['include_site_title'] ) : ?>
-			<div class="happy-blocks-global-header-site__title__wrapper">
-				<h1><?php echo esc_html( $args['site_title'] ); ?></h1>
-				<p><?php echo esc_html( $args['site_tagline'] ); ?></p>
-			</div>
-			<?php endif; ?>
-			<form class="<?php echo ! $args['include_site_title'] ? 'happy-blocks_inner_search' : ''; ?>" role="search"
-				method="get" action=""><label for="wp-block-search__input-1"
-					class="screen-reader-text"><?php echo esc_html( $args['search_placeholder'] ); ?></label>
-				<div class="happy-blocks-search__inside-wrapper"><input type="search" id="wp-block-search__input-1"
-						name="s" value="" placeholder="<?php echo esc_html( $args['search_placeholder'] ); ?>"></div>
-			</form>
-		</div>
-	</div>
-</div>