From 33dd15b17c6afb6e124b324c381dce26d8ab806c Mon Sep 17 00:00:00 2001
From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 14 Jul 2025 23:09:27 +0300
Subject: [PATCH] Clear floats in diary entries

---
 app/views/diary_entries/_diary_entry.html.erb |  2 +-
 test/system/diary_entry_test.rb               | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index dc41380b3..b08997a9f 100644
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -1,7 +1,7 @@
 <article class='diary_post border-top border-secondary-subtle py-3<%= " text-body-secondary px-3 bg-danger bg-opacity-10" unless diary_entry.visible %> user_<%= diary_entry.user.id %>'>
   <%= render :partial => "diary_entry_heading", :object => diary_entry, :as => "diary_entry" %>
 
-  <div class="richtext text-break" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
+  <div class="richtext text-break clearfix" xml:lang="<%= diary_entry.language_code %>" lang="<%= diary_entry.language_code %>">
     <% if truncated %>
       <% truncated_entry = diary_entry.body.truncate_html(2000) %>
       <%= truncated_entry[:html] %>
diff --git a/test/system/diary_entry_test.rb b/test/system/diary_entry_test.rb
index 36cc73f9e..16cb523bc 100644
--- a/test/system/diary_entry_test.rb
+++ b/test/system/diary_entry_test.rb
@@ -148,4 +148,15 @@ class DiaryEntrySystemTest < ApplicationSystemTestCase
     assert_content body
     assert_no_content I18n.t("diary_entries.diary_entry.full_entry")
   end
+
+  test "contents after diary entry should be below floated images" do
+    user = create(:user)
+    diary_entry = create(:diary_entry, :user => user, :body => "<img width=100 height=1000 align=left alt='Floated Image'>")
+
+    sign_in_as(user)
+    visit diary_entry_path(user, diary_entry)
+
+    img = find "img[alt='Floated Image']"
+    assert_link "Edit this entry", :below => img
+  end
 end
-- 
2.39.5