Merge remote-tracking branch 'upstream/pull/4662'

diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 618ce444ead8d7ec8a77a71e5675a2e29703aa3f..14aaad9cb4f1851a243119ec3c887e8394c9244c 100644 (file)
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -842,8 +842,6 @@ tr.turn:hover {
 }
 
 .search_form {
-  background-color: $lightgrey;
-
   #query {
     z-index: 0;
   }
@@ -853,10 +851,6 @@ tr.turn:hover {
   }
 }
 
-.directions_form {
-  background-color: $lightgrey;
-}
-
 /* Rules for user images */
 
 img.user_image {

diff --git a/app/views/layouts/_search.html.erb b/app/views/layouts/_search.html.erb
index 397fdb8289b16fe3b4249d47ae787c4806685af3..c7939aa01c955975688a24a7b37ed851bfbbf83d 100644 (file)
--- a/app/views/layouts/_search.html.erb
+++ b/app/views/layouts/_search.html.erb
@@ -1,5 +1,5 @@
 <div class="search_forms">
-  <form method="GET" action="<%= search_path %>" class="search_form px-1 py-2">
+  <form method="GET" action="<%= search_path %>" class="search_form bg-body-secondary px-1 py-2">
     <div class="row gx-2 mx-0">
       <div class="col">
         <div class="input-group flex-nowrap">
@@ -16,7 +16,7 @@
     </div>
   </form>
 
-  <form method="GET" action="<%= directions_path %>" class="directions_form pb-3">
+  <form method="GET" action="<%= directions_path %>" class="directions_form bg-body-secondary pb-3">
     <div class="d-flex flex-row-reverse px-3 py-3"><button type="button" class="btn-close" aria-label="<%= t("javascripts.close") %>"></button></div>
 
     <div class="row gx-2 m-1">