From d42df2694cd669db2895821f0812aa6721d8d6a2 Mon Sep 17 00:00:00 2001
From: Joseph Smith <joseph.smit95@gmail.com>
Date: Tue, 11 Jun 2024 22:10:04 -0400
Subject: [PATCH 1/2] Fix New Fund Request button styling

Edited the styling of the new fund request button to adhere with
the styling of other buttons on casa case details.

On different size screens button would appear misaligned with the
rest of the header.
---
 .../_generate_report_modal.html.erb           |  2 +-
 app/views/casa_cases/show.html.erb            | 52 ++++++++++---------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/app/views/casa_cases/_generate_report_modal.html.erb b/app/views/casa_cases/_generate_report_modal.html.erb
index b807383c38..f6429f0815 100644
--- a/app/views/casa_cases/_generate_report_modal.html.erb
+++ b/app/views/casa_cases/_generate_report_modal.html.erb
@@ -2,7 +2,7 @@
   <% id = "generate-docx-report-modal" %>
   <%= render(Modal::OpenButtonComponent.new(
     target: id,
-    klass: "d-inline main-btn btn-hover btn-sm success-btn pull-right mb-2")) do %>
+    klass: "d-inline main-btn btn-hover btn-sm success-btn pull-right")) do %>
     Generate Report
   <% end %>
   <%= render(Modal::GroupComponent.new(id: id)) do |component| %>
diff --git a/app/views/casa_cases/show.html.erb b/app/views/casa_cases/show.html.erb
index 2ecda6293c..42d37c2bc9 100644
--- a/app/views/casa_cases/show.html.erb
+++ b/app/views/casa_cases/show.html.erb
@@ -1,33 +1,35 @@
 <div class="row">
   <%= render "thank_you_modal" %>
-  <div class="col-sm-12 form-header my-4">
-    <h1 class="pull-left"><%= @casa_case.decorate.transition_aged_youth_icon %>CASA Case Details</h1>
-    <%- if policy(:case_contact).new? & @casa_case.active? %>
-      <%= link_to new_case_contact_path(case_contact: {casa_case_id: @casa_case.id}), class: "main-btn primary-btn btn-sm btn-hover pull-left casa-case-button" do %>
-        <i class="lni lni-plus mr-10"></i>
-        New Case Contact
+  <div class="col-sm-12 form-header d-flex flex-wrap justify-content-between">
+    <h1 class="pull-left my-4"><%= @casa_case.decorate.transition_aged_youth_icon %>CASA Case Details</h1>
+    <div class="d-inline-flex flex-wrap my-4 gap-3">
+      <%- if policy(:case_contact).new? & @casa_case.active? %>
+        <%= link_to new_case_contact_path(case_contact: {casa_case_id: @casa_case.id}), class: "main-btn primary-btn btn-sm btn-hover pull-left" do %>
+          <i class="lni lni-plus mr-10"></i>
+          New Case Contact
+        <% end %>
+      <%- end %>
+      <% if @casa_case.active? %>
+        <%= link_to edit_casa_case_path(@casa_case), class: "main-btn primary-btn btn-sm btn-hover pull-left" do %>
+          <i class="lni lni-pencil mr-10"></i>
+          Edit Case Details
+        <% end %>
       <% end %>
-    <%- end %>
-    <% if @casa_case.active? %>
-      <%= link_to edit_casa_case_path(@casa_case), class: "main-btn primary-btn btn-sm btn-hover pull-left casa-case-button pull-left casa-case-button" do %>
-        <i class="lni lni-pencil mr-10"></i>
-        Edit Case Details
+      <% if @casa_case.in_transition_age? %>
+        <%= link_to(casa_case_emancipation_path(@casa_case),
+                class: "main-btn primary-btn btn-sm") do %>
+          Emancipation
+          <%= render BadgeComponent.new(text: @casa_case.decorate.emancipation_checklist_count,
+                                        type: :light,
+                                        margin: false) %>
+        <% end %>
       <% end %>
-    <% end %>
-    <% if @casa_case.in_transition_age? %>
-      <%= link_to(casa_case_emancipation_path(@casa_case),
-              class: "main-btn primary-btn btn-sm pull-left casa-case-button") do %>
-        Emancipation
-        <%= render BadgeComponent.new(text: @casa_case.decorate.emancipation_checklist_count,
-                                      type: :light,
-                                      margin: false) %>
+      <% if @casa_case.casa_org.show_fund_request %>
+        <%= link_to("New Fund Request", new_casa_case_fund_request_path(@casa_case),
+  class: "main-btn primary-btn btn-sm") %>
       <% end %>
-    <% end %>
-    <%= render "casa_cases/generate_report_modal" %>
-    <% if @casa_case.casa_org.show_fund_request %>
-      <%= link_to("New Fund Request", new_casa_case_fund_request_path(@casa_case),
-class: "btn btn-primary pull-left casa-case-button") %>
-    <% end %>
+      <%= render "casa_cases/generate_report_modal" %>
+    </div>
   </div>
 </div>
 <div class="card card-container">

From e23129dbc2a114d1ec13ae3ba03513a8035784f9 Mon Sep 17 00:00:00 2001
From: josephmsmith <josephmsmith@users.noreply.github.com>
Date: Wed, 12 Jun 2024 02:16:02 +0000
Subject: [PATCH 2/2] chore(docs): update TOC

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 73713f14a3..f22c468c7d 100644
--- a/README.md
+++ b/README.md
@@ -18,6 +18,7 @@ A CASA (Court Appointed Special Advocate) is a role where a volunteer advocates
 **Table of Contents**
 
   - [Welcome contributors!](#welcome-contributors)
+    - [Communication and Collaboration](#communication-and-collaboration)
     - [About this project](#about-this-project)
 - [Developing! ✨🛠✨](#developing-)
   - [How to Contribute](#how-to-contribute)
@@ -28,7 +29,6 @@ A CASA (Court Appointed Special Advocate) is a role where a volunteer advocates
   - [Running the App / Verifying Installation](#running-the-app--verifying-installation)
 - [Other Documentation](#other-documentation)
 - [Acknowledgements](#acknowledgements)
-- [Communication and Collaboration](#communication-and-collaboration)
 - [Feedback](#feedback)
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->