From ebee208e4661f1179ac1f2550fc09ec2b0a8580d Mon Sep 17 00:00:00 2001
From: DanielVajnagi <82052651+DanielVajnagi@users.noreply.github.com>
Date: Mon, 2 Dec 2024 01:22:36 +0200
Subject: [PATCH] minor

---
 .../calculators/partials/_color_selector.html.erb        | 2 +-
 app/views/account/calculators/partials/_form.html.erb    | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/app/views/account/calculators/partials/_color_selector.html.erb b/app/views/account/calculators/partials/_color_selector.html.erb
index c816724b3..ebb1b75f6 100644
--- a/app/views/account/calculators/partials/_color_selector.html.erb
+++ b/app/views/account/calculators/partials/_color_selector.html.erb
@@ -1,3 +1,3 @@
 <div class="nested-fields">
-  <%= f.input :color, as: :color, label: 'Choose a Color for Calculator Page', input_html: { class: 'form-control form-control-color p-2', style: 'width: 7rem; height: 3.5rem;' } %>
+  <%= f.input :color, as: :color, label: 'Choose a Color for Calculator Page:', input_html: { class: 'form-control form-control-color p-2', style: 'width: 7rem; height: 3.5rem;' } %>
 </div>
diff --git a/app/views/account/calculators/partials/_form.html.erb b/app/views/account/calculators/partials/_form.html.erb
index 1f2a3a91f..0166086bb 100644
--- a/app/views/account/calculators/partials/_form.html.erb
+++ b/app/views/account/calculators/partials/_form.html.erb
@@ -3,6 +3,9 @@
     <div class="my-auto col-12 has-float-label">
       <%= f.input :en_name, label: "Calculator Name:", class: 'form-control' %>
       <%= f.input :uk_name, label: "Uk Calculator Name:", class: 'form-control' %>
+      <div id="fields" class="space-y-4">
+        <%= render "account/calculators/partials/color_selector", f: f %>
+      </div>
 
       <!-- formula input-->
       <div id="formulas" class="space-y-4">
@@ -23,12 +26,6 @@
           <%= link_to_add_association "Add Field", f, :fields, partial: "account/calculators/partials/field_fields", class: "underline" %>
         </div>
       </div>
-
-      <div id="fields" class="space-y-4">
-        <%= f.simple_fields_for :color do |color_selector| %>
-          <%= render "account/calculators/partials/color_selector", f: f %>
-        <% end %>
-      </div>
     </div>
   </div>