From f055b7fb7424f0a62f71e6d2dad0b7ee64ad8f02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <barisusakli@gmail.com>
Date: Fri, 21 Apr 2023 16:08:12 -0400
Subject: [PATCH] refactor: get rid of floats in deleted-message.tpl

---
 src/views/partials/topic/deleted-message.tpl | 11 ++++-------
 src/views/partials/topic/merged-message.tpl  | 11 ++++-------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/views/partials/topic/deleted-message.tpl b/src/views/partials/topic/deleted-message.tpl
index 93f1bab34e..0f7df69439 100644
--- a/src/views/partials/topic/deleted-message.tpl
+++ b/src/views/partials/topic/deleted-message.tpl
@@ -1,11 +1,8 @@
-<div component="topic/deleted/message" class="alert alert-warning mt-3{{{ if !deleted }}} hidden{{{ end }}} clearfix">
-    <span class="float-start">[[topic:deleted_message]]</span>
-    <span class="float-end">
+<div component="topic/deleted/message" class="alert alert-warning mt-3{{{ if !deleted }}} hidden{{{ end }}} d-flex justify-content-between flex-wrap">
+    <span>[[topic:deleted_message]]</span>
+    <span>
         {{{ if deleter }}}
-        <a href="{config.relative_path}/user/{deleter.userslug}">
-            <strong>{deleter.username}</strong>
-        </a>
-        <small class="timeago" title="{deletedTimestampISO}"></small>
+        <a class="fw-bold" href="{config.relative_path}/user/{deleter.userslug}">{deleter.username}</a> <small class="timeago" title="{deletedTimestampISO}"></small>
         {{{ end }}}
     </span>
 </div>
\ No newline at end of file
diff --git a/src/views/partials/topic/merged-message.tpl b/src/views/partials/topic/merged-message.tpl
index e84e0ef68a..5b24459d91 100644
--- a/src/views/partials/topic/merged-message.tpl
+++ b/src/views/partials/topic/merged-message.tpl
@@ -1,9 +1,6 @@
-<div component="topic/merged/message" class="alert alert-warning mt-3 clearfix">
-	<span class="float-start">[[topic:merged_message, {config.relative_path}/topic/{mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
-	<span class="float-end">
-		<a href="{config.relative_path}/user/{merger.userslug}">
-			<strong>{merger.username}</strong>
-		</a>
-		<small class="timeago" title="{mergedTimestampISO}"></small>
+<div component="topic/merged/message" class="alert alert-warning mt-3 d-flex justify-content-between flex-wrap">
+	<span>[[topic:merged_message, {config.relative_path}/topic/{mergeIntoTid}, {merger.mergedIntoTitle}]]</span>
+	<span>
+		<a class="fw-bold" href="{config.relative_path}/user/{merger.userslug}">{merger.username}</strong></a> <small class="timeago" title="{mergedTimestampISO}"></small>
 	</span>
 </div>
\ No newline at end of file