From d5aa6189b698b80363db3cfff9f026836c192ade Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Fri, 31 Mar 2023 19:05:18 +0000
Subject: [PATCH 1/2] [ticket/17125] Use FlexBox for message and smileys

PHPBB3-17125
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 ++
 phpBB/styles/prosilver/theme/forms.css              | 6 ++++++
 phpBB/styles/prosilver/theme/responsive.css         | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 12790360d6..70a66be76c 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -47,6 +47,7 @@
 
 	<!-- INCLUDE posting_buttons.html -->
 
+	<div class="smiley-message-box">
 	<div id="smiley-box" class="smiley-box">
 		<!-- EVENT posting_editor_smilies_before -->
 		<!-- IF S_SMILIES_ALLOWED and .smiley -->
@@ -88,6 +89,7 @@
 	</div>
 
 	<!-- EVENT posting_editor_message_after -->
+	</div>	
 	</fieldset>
 
 <!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 39dd81e2b6..03d32cdadf 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -284,6 +284,12 @@ fieldset.submit-buttons input {
 	margin: 3px;
 }
 
+.smiley-message-box {
+	display: flex;
+	flex-direction: row-reverse;
+	justify-content: space-between;
+}
+
 /* Input field styles
 ---------------------------------------- */
 .inputbox {
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index a53dadc2b7..a8a316ff3b 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -376,6 +376,10 @@
 		margin-top: 5px;
 	}
 
+	.smiley-message-box {
+		display: block;
+	}
+
 	.bbcode-status {
 		display: none;
 	}

From 9db5da5b3d29476343dced674e9808afb77c0950 Mon Sep 17 00:00:00 2001
From: Matt Friedman <maf675@gmail.com>
Date: Sun, 2 Apr 2023 14:27:35 +0000
Subject: [PATCH 2/2] [ticket/17125] Use box-sizing to fix message box

PHPBB3-17125
---
 phpBB/styles/prosilver/template/posting_editor.html | 2 --
 phpBB/styles/prosilver/theme/forms.css              | 9 +++------
 phpBB/styles/prosilver/theme/responsive.css         | 4 ----
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 70a66be76c..12790360d6 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -47,7 +47,6 @@
 
 	<!-- INCLUDE posting_buttons.html -->
 
-	<div class="smiley-message-box">
 	<div id="smiley-box" class="smiley-box">
 		<!-- EVENT posting_editor_smilies_before -->
 		<!-- IF S_SMILIES_ALLOWED and .smiley -->
@@ -89,7 +88,6 @@
 	</div>
 
 	<!-- EVENT posting_editor_message_after -->
-	</div>	
 	</fieldset>
 
 <!-- IF $EXTRA_POSTING_OPTIONS eq 1 -->
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 03d32cdadf..ab9ac7a44c 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -259,6 +259,9 @@ fieldset.submit-buttons input {
 
 .message-box textarea {
 	font-family: "Trebuchet MS", Verdana, Helvetica, Arial, sans-serif;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
 	width: 450px;
 	height: 270px;
 	min-width: 100%;
@@ -284,12 +287,6 @@ fieldset.submit-buttons input {
 	margin: 3px;
 }
 
-.smiley-message-box {
-	display: flex;
-	flex-direction: row-reverse;
-	justify-content: space-between;
-}
-
 /* Input field styles
 ---------------------------------------- */
 .inputbox {
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index a8a316ff3b..a53dadc2b7 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -376,10 +376,6 @@
 		margin-top: 5px;
 	}
 
-	.smiley-message-box {
-		display: block;
-	}
-
 	.bbcode-status {
 		display: none;
 	}