From 17bf8177513f9c66ee75bf02cb6e5a2a14ed2016 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 7 Apr 2023 12:25:12 +0100
Subject: [PATCH] Reorder like the block inspector

---
 .../components/global-styles/screen-block.js  | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/screen-block.js b/packages/edit-site/src/components/global-styles/screen-block.js
index 3274f5b6805e6..4e288e3c59ace 100644
--- a/packages/edit-site/src/components/global-styles/screen-block.js
+++ b/packages/edit-site/src/components/global-styles/screen-block.js
@@ -84,14 +84,6 @@ function ScreenBlock( { name, variation } ) {
 		<>
 			<ScreenHeader title={ blockType.title } />
 			<BlockPreviewPanel name={ name } variation={ variation } />
-			{ hasTypographyPanel && (
-				<StylesTypographyPanel
-					inheritedValue={ inheritedStyle }
-					value={ style }
-					onChange={ setStyle }
-					settings={ settings }
-				/>
-			) }
 			{ hasColorPanel && (
 				<StylesColorPanel
 					inheritedValue={ inheritedStyle }
@@ -100,8 +92,8 @@ function ScreenBlock( { name, variation } ) {
 					settings={ settings }
 				/>
 			) }
-			{ hasBorderPanel && (
-				<StylesBorderPanel
+			{ hasTypographyPanel && (
+				<StylesTypographyPanel
 					inheritedValue={ inheritedStyle }
 					value={ style }
 					onChange={ setStyle }
@@ -117,6 +109,14 @@ function ScreenBlock( { name, variation } ) {
 					includeLayoutControls
 				/>
 			) }
+			{ hasBorderPanel && (
+				<StylesBorderPanel
+					inheritedValue={ inheritedStyle }
+					value={ style }
+					onChange={ setStyle }
+					settings={ settings }
+				/>
+			) }
 			{ hasEffectsPanel && (
 				<StylesEffectsPanel
 					inheritedValue={ inheritedStyleWithLayout }