From fe73d9191597f57a3a4e6b8b7c043fa8f1623d8b Mon Sep 17 00:00:00 2001
From: BrilliantDeviation7 <kevin2006.zhu@gmail.com>
Date: Fri, 30 Jan 2026 23:38:52 -0500
Subject: [PATCH 1/2] Update event comments layout and styling

---
 app/assets/stylesheets/events.css.scss | 15 +++++++-
 app/views/events/show.html.erb         | 47 +++++++++++++-------------
 2 files changed, 38 insertions(+), 24 deletions(-)

diff --git a/app/assets/stylesheets/events.css.scss b/app/assets/stylesheets/events.css.scss
index b85616af..a008bb7c 100644
--- a/app/assets/stylesheets/events.css.scss
+++ b/app/assets/stylesheets/events.css.scss
@@ -341,8 +341,21 @@ table.eventslist .ticless {
 }
 
 #event-comments form textarea {
+  max-width: 100%;
   width: 100%;
-  height: 5em;
+  height: 4em;
+  box-sizing: border-box;
+  resize: vertical;
+}
+
+#event-comments fieldset {
+  p {
+    margin: 5px 0;
+  }
+
+  .comment-member {
+    font-weight: bold;
+  }
 }
 
 #event-comments form input[type=submit] {
diff --git a/app/views/events/show.html.erb b/app/views/events/show.html.erb
index bdfe3b88..69388eea 100644
--- a/app/views/events/show.html.erb
+++ b/app/views/events/show.html.erb
@@ -72,6 +72,30 @@
         <% end %>
       </ul>
     </div>
+
+    <div id="event-comments" class="event-box">
+      <h4>Comments</h4>
+    
+      <% @event.comments.each do |comment| %>
+        <fieldset>
+          <legend>
+            <%= comment.created_at.strftime("%m/%d/%y, %I:%M%p") %> - 
+            <span class="comment-member"><%= comment.member %></span>
+            <% if can? :destroy, comment %>
+              (<%= link_to "delete", comment_url(comment), :method => :delete, data: {confirm: "Are you sure you would like to delete this comment?"} %>)
+            <% end %>
+          </legend>
+          <%= auto_link simple_format comment.content %>
+        </fieldset>
+      <% end %>
+    
+      <%= form_for @event.comments.build do |f| %>
+        <%= f.hidden_field :event_id %>
+        <%= f.text_area :content %>
+        <br />
+        <%= f.submit "New Comment" %>
+      <% end %>
+    </div>
   
     <% if can? :create, Invoice.new(event: @event) or not @event.invoices.accessible_by(current_ability).empty? %>
       <div id="event-invoices">
@@ -166,29 +190,6 @@
       </div>
     <% end %>
   </div>
-  
-  <div id="event-comments" class="event-box">
-    <h4>Comments</h4>
-  
-    <% @event.comments.each do |comment| %>
-      <fieldset>
-        <legend>
-          <%= comment.member %> said on <%= comment.created_at.strftime("%m/%d/%y at %I:%M%p") %>
-          <% if can? :destroy, comment %>
-            (<%= link_to "delete", comment_url(comment), :method => :delete, data: {confirm: "Are you sure you would like to delete this comment?"} %>)
-          <% end %>
-        </legend>
-        <%= auto_link simple_format comment.content %>
-      </fieldset>
-    <% end %>
-  
-    <%= form_for @event.comments.build do |f| %>
-      <%= f.hidden_field :event_id %>
-      <%= f.text_area :content %>
-      <br />
-      <%= f.submit "New Comment" %>
-    <% end %>
-  </div>
 </div>
 
 <% if can? :update, @event or can? :destroy, @event or can? :read, Timecard or not @event.emails.empty? %>

From 448dfe366820e5b37992e07b4b9f7971b9b1ea52 Mon Sep 17 00:00:00 2001
From: BrilliantDeviation7 <kevin2006.zhu@gmail.com>
Date: Sat, 31 Jan 2026 17:35:58 -0500
Subject: [PATCH 2/2] Update comment outline color

---
 app/assets/stylesheets/events.css.scss | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/events.css.scss b/app/assets/stylesheets/events.css.scss
index a008bb7c..17f33753 100644
--- a/app/assets/stylesheets/events.css.scss
+++ b/app/assets/stylesheets/events.css.scss
@@ -343,12 +343,14 @@ table.eventslist .ticless {
 #event-comments form textarea {
   max-width: 100%;
   width: 100%;
-  height: 4em;
+  height: 3.5em;
   box-sizing: border-box;
   resize: vertical;
 }
 
 #event-comments fieldset {
+  border: 2px solid crimson;
+
   p {
     margin: 5px 0;
   }