From b1c8a5b4c3fd7b2f9dbed88c670ee8b4d7f97e16 Mon Sep 17 00:00:00 2001
From: David Gay <david@davidgay.org>
Date: Sat, 5 Jun 2021 20:25:51 -0400
Subject: Swap location of results box and chat box

---
 CHANGELOG.md                           |  7 ++++---
 app/views/layouts/application.html.erb | 12 +++++++-----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4223b84..7bf1ce7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,9 +43,10 @@ All notable changes to this project will be documented in this file.
   including a "Cancel" button.
   
 ## UI
-- Game now scales to screen size, and a bit more relative space is given to the main box. This may have introduced
-  undesirable consequences, especially on mobile. Please report these consequences with screenshots, and let's work
-  together to get the game looking decent everywhere. 👍
+- Game now scales to screen size, and a bit more relative space is given to the main box. Additionally, the positioning
+  of the UI boxes has been shuffled and tweaked.
+  - These changes may have introduced undesirable consequences, especially on mobile. Please report these
+    consequences with screenshots, and let's work together to get the game looking decent everywhere. 👍
 
 ### Engine
 - Refactored some activity and combat code.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 577debc..a7068cd 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -25,20 +25,22 @@
             <%= yield %>
           </div>
           <% if user_signed_in? %>
-            <div class="game-container-box overflow-auto text-sm p-2" id="result_output"
-                 style="min-height: 30%; max-height: 50%" data-turbolinks-permanent>
+            <div id="chat" class="game-container-box overflow-y-auto"
+                 style="min-height: 10%; max-height: 20%"
+                 data-turbolinks-permanent>
+              <%= render "chat" %>
             </div>
           <% end %>
         </div>
         <% if user_signed_in? %>
           <div class="flex flex-col game-container-column col-span-12 sm:col-span-4 xl:col-span-3">
             <div class="game-container-box mb-2 overflow-y-auto" id="activity_controls"
-                 style="min-height: 50%" data-turbolinks-permanent>
+                 style="min-height: 40%" data-turbolinks-permanent>
               <%= render "timer" %>
             </div>
-            <div id="chat" class="game-container-box overflow-y-auto"
+            <div class="game-container-box overflow-auto text-sm p-2 flex-grow" id="result_output"
+                 style="max-height: 60%"
                  data-turbolinks-permanent>
-              <%= render "chat" %>
             </div>
           </div>
         <% else %>
-- 
cgit v1.2.3