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

[rails.git] / app / views / dashboards / show.html.erb

diff --git a/app/views/dashboards/show.html.erb b/app/views/dashboards/show.html.erb
index 744661dfdbeb7bbd53a5ff812bfcf2a81b209030..d3e6dbcb3eb1153df59ec35369965f97688cfd62 100644 (file)
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -6,7 +6,7 @@
   <% if current_user and @user.id == current_user.id %>
     <div class="col-md order-md-last">
       <% if !@user.home_location? %>
   <% if current_user and @user.id == current_user.id %>
     <div class="col-md order-md-last">
       <% if !@user.home_location? %>

-        <div id="map" class="content_map border border-grey">
+        <div id="map" class="content_map border border-secondary-subtle">

           <p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
         </div>
       <% else %>
           <p class="m-3"><%= t(".no_home_location_html", :edit_profile_link => link_to(t(".edit_your_profile"), edit_profile_path)) %></p>
         </div>
       <% else %>


@@ -19,7 +19,7 @@
              :icon => image_path("marker-red.png"),
              :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
            } %>
              :icon => image_path("marker-red.png"),
              :description => render(:partial => "popup", :object => current_user, :locals => { :type => "your location" })
            } %>

-        <%= tag.div "", :id => "map", :class => "content_map border border-grey rounded", :data => { :user => user_data } %>
+        <%= tag.div "", :id => "map", :class => "content_map border border-secondary-subtle rounded", :data => { :user => user_data } %>

       <% end %>
 
       <% friends = @user.friends %>
       <% end %>
 
       <% friends = @user.friends %>