Fix broken wp-admin merge.

openlab-at-city-tech · Apr 12, 2023 · a77f31d · a77f31d
1 parent 599c8c2
commit a77f31d
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 94 deletions.
diff --git a/wp-admin/about.php b/wp-admin/about.php
@@ -209,13 +209,6 @@
 					<img src="https://s.w.org/images/core/6.1/about-61-sub-feature-3.webp" alt="" />
 				</div>
 				<h3 class="is-smaller-heading"><?php _e( 'More responsive text with fluid typography' ); ?></h3>
-				<p>
-					<?php _e( 'And say hello to the first default block theme in the history of WordPress. This is more than just a new default theme. It&#8217;s a brand-new way to work with WordPress themes.' ); ?>
-				</p>
-				<p>
-					<?php _e( 'Block themes put a wide array of visual choices in your hands, from color schemes and typeface combinations to page templates and image filters &#8212; all together, in the site editing interface. By making changes in one place, you can give Twenty Twenty&#8209;Two the same look and feel as your brand or other websites &#8212; or take your site&#8217;s look in another direction.' ); ?>
-				</p>
-				<?php if ( current_user_can( 'switch_themes' ) ) : ?>
 				<p>
 					<?php
 					printf(
@@ -225,7 +218,6 @@
 					);
 					?>
 				</p>
-				<?php endif; ?>
 			</div>
 		</div>
 
@@ -420,12 +412,6 @@
 					);
 					?>
 				</p>
-				<p>
-					<?php _e( 'Style every image in your gallery differently from the next (with different crops, or duotones, for instance) or make them all the same. And change the layout with drag-and-drop.' ); ?>
-				</p>
-			</div>
-			<div class="column about__image is-vertically-aligned-center is-edge-to-edge">
-				<img src="https://s.w.org/images/core/5.9/gallery-block.png" alt="" />
 			</div>
 		</div>
 
@@ -532,14 +518,6 @@
 					<img src="data:image/svg+xml,%3Csvg width='269' height='163' viewBox='0 0 269 163' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cg clip-path='url(%23a)'%3E%3Crect width='269' height='163' rx='4' fill='%23FDFF85'/%3E%3Cpath d='M238.84 130.043a1 1 0 0 0-1.524.852v8.21a1 1 0 0 0 1.524.852l6.671-4.105a1 1 0 0 0 0-1.703l-6.671-4.106Z' fill='%231E1E1E'/%3E%3Crect x='226.25' y='120.25' width='29.5' height='29.5' rx='2.75' stroke='%231E1E1E' stroke-width='1.5'/%3E%3Cpath d='M99.597 127.44c-6.16 0-11.36-1.16-15.6-3.48-4.24-2.32-7.68-5.4-10.32-9.24-2.56-3.84-4.4-8.16-5.52-12.96A64.74 64.74 0 0 1 66.477 87c0-9.28 1.28-17.4 3.84-24.36 2.64-6.96 6.4-12.36 11.28-16.2 4.88-3.92 10.8-5.88 17.76-5.88 5.521 0 10.241 1.08 14.161 3.24s6.96 5.04 9.12 8.64c2.24 3.6 3.6 7.52 4.08 11.76h-11.88c-.72-4.16-2.44-7.36-5.16-9.6-2.72-2.24-6.2-3.36-10.44-3.36-5.84 0-10.68 2.76-14.52 8.28-3.76 5.44-5.76 13.84-6 25.2 1.92-3.52 4.88-6.52 8.88-9 4.08-2.48 8.76-3.72 14.04-3.72 4.72 0 9.12 1.12 13.2 3.36 4.16 2.24 7.52 5.4 10.08 9.48 2.64 4 3.96 8.76 3.96 14.28 0 4.88-1.2 9.48-3.6 13.8-2.4 4.32-5.8 7.84-10.2 10.56-4.32 2.64-9.48 3.96-15.48 3.96Zm-.72-11.04c3.361 0 6.361-.72 9.001-2.16 2.64-1.44 4.72-3.4 6.24-5.88 1.52-2.56 2.28-5.44 2.28-8.64 0-5.12-1.68-9.2-5.04-12.24-3.28-3.04-7.48-4.56-12.6-4.56-3.36 0-6.4.76-9.12 2.28-2.64 1.52-4.72 3.56-6.24 6.12-1.52 2.48-2.28 5.24-2.28 8.28 0 3.28.76 6.2 2.28 8.76 1.6 2.48 3.72 4.44 6.36 5.88 2.72 1.44 5.76 2.16 9.12 2.16Zm45.925 10.32c-2.4 0-4.4-.76-6-2.28-1.52-1.6-2.28-3.48-2.28-5.64 0-2.24.76-4.12 2.28-5.64 1.6-1.6 3.6-2.4 6-2.4s4.36.8 5.88 2.4c1.52 1.52 2.28 3.4 2.28 5.64 0 2.16-.76 4.04-2.28 5.64-1.52 1.52-3.48 2.28-5.88 2.28Zm26.814-.72V56.4l-13.56 3.12v-9.36l18.6-8.16h8.16v84h-13.2Z' fill='%231E1E1E'/%3E%3C/g%3E%3Cdefs%3E%3CclipPath id='a'%3E%3Crect width='269' height='163' rx='4' fill='%23fff'/%3E%3C/clipPath%3E%3C/defs%3E%3C/svg%3E%0A" alt="<?php echo esc_attr( __( 'Exploring WordPress 6.1 video' ) ); ?>" />
 				</a>
 			</div>
-		</div>
-
-		<hr class="is-large" />
-
-		<div class="about__section has-subtle-background-color has-2-columns is-wider-right">
-			<div class="column about__image is-vertically-aligned-center">
-				<img src="https://s.w.org/images/core/5.9/learn-video.png" alt="" />
-			</div>
 			<div class="column">
 				<h3>
 					<?php

diff --git a/wp-admin/css/about-rtl.css b/wp-admin/css/about-rtl.css
@@ -681,13 +681,6 @@
 	margin-bottom: 9rem;
 }
 
-.freedoms-php .about__header-title,
-.freedoms-php .about__header-text {
-	/* 423px = 375px (balloon width) + 32px (offset from edge) + 16px (spacing). */
-	padding-left: 423px;
-	margin-left: 0;
-}
-
 .about__header-navigation {
 	position: relative;
 	z-index: 1;
@@ -756,27 +749,6 @@
 }
 
 @media screen and (max-width: 782px) {
-	.about__header::before {
-		width: 240px;
-		height: 305px;
-		left: 32px;
-	}
-
-	.credits-php .about__header::before {
-		height: 248px;
-	}
-
-	.freedoms-php .about__header::before {
-		top: calc(50% - 132px);
-		height: 192px;
-		width: 240px;
-	}
-
-	.privacy-php .about__header::before {
-		bottom: 0;
-		height: 280px;
-	}
-
 	.about__container .about__header-text {
 		font-size: 1.4em;
 	}
@@ -785,12 +757,6 @@
 		display: block;
 	}
 
-	.about__header-title,
-	.about__header-text {
-		/* 288px = 240px (balloon width) + 32px (offset from edge) + 16px (spacing). */
-		padding-left: 288px !important;
-	}
-
 	.about__header-title,
 	.about__header-image {
 		margin-right: calc(var(--gap) / 2);

diff --git a/wp-admin/css/about.css b/wp-admin/css/about.css
@@ -680,13 +680,6 @@
 	margin-bottom: 9rem;
 }
 
-.freedoms-php .about__header-title,
-.freedoms-php .about__header-text {
-	/* 423px = 375px (balloon width) + 32px (offset from edge) + 16px (spacing). */
-	padding-right: 423px;
-	margin-right: 0;
-}
-
 .about__header-navigation {
 	position: relative;
 	z-index: 1;
@@ -755,27 +748,6 @@
 }
 
 @media screen and (max-width: 782px) {
-	.about__header::before {
-		width: 240px;
-		height: 305px;
-		right: 32px;
-	}
-
-	.credits-php .about__header::before {
-		height: 248px;
-	}
-
-	.freedoms-php .about__header::before {
-		top: calc(50% - 132px);
-		height: 192px;
-		width: 240px;
-	}
-
-	.privacy-php .about__header::before {
-		bottom: 0;
-		height: 280px;
-	}
-
 	.about__container .about__header-text {
 		font-size: 1.4em;
 	}
@@ -784,12 +756,6 @@
 		display: block;
 	}
 
-	.about__header-title,
-	.about__header-text {
-		/* 288px = 240px (balloon width) + 32px (offset from edge) + 16px (spacing). */
-		padding-right: 288px !important;
-	}
-
 	.about__header-title,
 	.about__header-image {
 		margin-left: calc(var(--gap) / 2);

diff --git a/wp-admin/edit-form-blocks.php b/wp-admin/edit-form-blocks.php
@@ -28,10 +28,6 @@
 $current_screen = get_current_screen();
 $current_screen->is_block_editor( true );
 
-// Load block patterns from w.org.
-_load_remote_block_patterns();
-_load_remote_featured_patterns();
-
 // Default to is-fullscreen-mode to avoid jumps in the UI.
 add_filter(
 	'admin_body_class',