From 188277f6efc3e8f3766039e69cc82cae0fe52a34 Mon Sep 17 00:00:00 2001
From: Margarita Barvinok <brita@umich.edu>
Date: Tue, 30 Jul 2024 15:07:55 -0400
Subject: [PATCH 1/3] edit prefs page style

---
 .../app_preferences/configure_prefs.html.erb  | 52 +++++++++----------
 1 file changed, 25 insertions(+), 27 deletions(-)

diff --git a/app/views/app_preferences/configure_prefs.html.erb b/app/views/app_preferences/configure_prefs.html.erb
index bc1b34f1..a67ac983 100644
--- a/app/views/app_preferences/configure_prefs.html.erb
+++ b/app/views/app_preferences/configure_prefs.html.erb
@@ -1,30 +1,28 @@
-<div class="mx-auto w-100">
-  <div class="px-5 py-3">
-    <h1>Configure App Preferences</h1>
-    <%= form_tag save_configured_prefs_app_preferences_path, method: :post do %>
-      <% @configure_prefs.each do |pref| %>
-        <%= fields_for 'configure_prefs[]' do %>
-          <div>
-            <% if pref.pref_type == "boolean" %>
-              <div class="my-3 py-3">
-                <%= hidden_field_tag "configure_pref[#{pref.name}]", 0 %>
-                <%= check_box_tag "configure_pref[#{pref.name}]", 1, pref.value == 't', class: "check_box" %>
-                <span class="check_box_text"><%= pref.description %></span>
-              </div>
-            <% elsif pref.pref_type == "string" %>
-              <!--we dont have fancy label here yet-->
-              <label for=<%= "configure_pref_#{pref.name}" %> class="bold-label"><%= pref.description %></label>
-                <%= text_field_tag("configure_pref[#{pref.name}]", pref.value, {class: "ms-2"}) %>
-            <% elsif pref.pref_type == "integer" %>
-              <label for=<%= "configure_pref_#{pref.name}" %> class="bold-label"><%= pref.description %></label>
-                <%= number_field_tag("configure_pref[#{pref.name}]", pref.value, {class: "ms-2"}) %>
-            <% end %>
-          </div>
-        <% end %>
+<div class="container-fluid">
+  <h1>Configure App Preferences</h1>
+  <%= form_tag save_configured_prefs_app_preferences_path, method: :post do %>
+    <% @configure_prefs.each do |pref| %>
+      <%= fields_for 'configure_prefs[]' do %>
+        <div>
+          <% if pref.pref_type == "boolean" %>
+            <div class="my-3 py-3">
+              <%= hidden_field_tag "configure_pref[#{pref.name}]", 0 %>
+              <%= check_box_tag "configure_pref[#{pref.name}]", 1, pref.value == 't', class: "check_box" %>
+              <span class="check_box_text"><%= pref.description %></span>
+            </div>
+          <% elsif pref.pref_type == "string" %>
+            <!--we dont have fancy label here yet-->
+            <label for=<%= "configure_pref_#{pref.name}" %> class="bold-label"><%= pref.description %></label>
+              <%= text_field_tag("configure_pref[#{pref.name}]", pref.value, {class: "ms-2"}) %>
+          <% elsif pref.pref_type == "integer" %>
+            <label for=<%= "configure_pref_#{pref.name}" %> class="bold-label"><%= pref.description %></label>
+              <%= number_field_tag("configure_pref[#{pref.name}]", pref.value, {class: "ms-2"}) %>
+          <% end %>
+        </div>
       <% end %>
-      <div class="inline">
-        <%= submit_tag 'Update your preferences' %>
-      </div>
     <% end %>
-  </div>
+    <div class="inline">
+      <%= submit_tag 'Update App Preferences' %>
+    </div>
+  <% end %>
 </div>

From 047d20c5fa89b84c71b4fdb6d595fb0b021e2f9a Mon Sep 17 00:00:00 2001
From: Margarita Barvinok <brita@umich.edu>
Date: Tue, 30 Jul 2024 15:10:14 -0400
Subject: [PATCH 2/3] fix color variable

---
 app/assets/stylesheets/_custom_layout.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/_custom_layout.scss b/app/assets/stylesheets/_custom_layout.scss
index 91b824fb..5743cf0d 100644
--- a/app/assets/stylesheets/_custom_layout.scss
+++ b/app/assets/stylesheets/_custom_layout.scss
@@ -208,7 +208,7 @@ svg.wh6 {
 }
 
 .link_to {
-  color: $um-blue;
+  color: $um_blue;
   text-decoration: none; /* Ensures no underline by default */
 }
 

From 63489fdac3a48e5bc139fe40a330887fad64008c Mon Sep 17 00:00:00 2001
From: Margarita Barvinok <brita@umich.edu>
Date: Tue, 30 Jul 2024 15:10:34 -0400
Subject: [PATCH 3/3] fix nav bar

---
 app/views/shared/_navbar.html.erb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index 6c18fd17..1d5d337e 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -66,8 +66,6 @@
       <div class="nav-item dropdown navbar_dropdown_item h-100 px-2 rounded-0 border-0" style="--bs-focus-ring-color:#E5E5E5;">
         <%= link_to "Rover Form", zones_rover_navigation_path, class: 'nav-link h-100 d-flex align-items-center fs-5 focus-ring border-0 rounded-2' if policy(:rover_navigation).zones? %>
       </div>
-        Rover Form
-      </a>
       <ul class="dropdown-menu bg-primary rounded-0 navbar_dropdown_item">
         <li>
           <%= link_to "Choose Room", zones_rover_navigation_path, class: 'dropdown-item navbar_dropdown_item' if policy(:rover_navigation).zones? %>