Skip to content

Commit

Permalink
Merge pull request #226 from lsa-mis/keep-editing-styles
Browse files Browse the repository at this point in the history
Keep editing styles
  • Loading branch information
britaumich authored Jul 30, 2024
2 parents 3429ab3 + 63489fd commit f113bcd
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 30 deletions.
2 changes: 1 addition & 1 deletion app/assets/stylesheets/_custom_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ svg.wh6 {
}

.link_to {
color: $um-blue;
color: $um_blue;
text-decoration: none; /* Ensures no underline by default */
}

Expand Down
52 changes: 25 additions & 27 deletions app/views/app_preferences/configure_prefs.html.erb
Original file line number Diff line number Diff line change
@@ -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>
2 changes: 0 additions & 2 deletions app/views/shared/_navbar.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -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? %>
Expand Down

0 comments on commit f113bcd

Please sign in to comment.