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

[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 eb3ceef6c528e35174acaf7c3053694f6a2741df..c4b595e9b931dc6ba5e79be030105f082433a3d3 100644 (file)
--- a/app/views/dashboards/show.html.erb
+++ b/app/views/dashboards/show.html.erb
@@ -5,8 +5,8 @@
 <div class="row">
   <% if current_user and @user.id == current_user.id %>
     <div class="col-md order-md-last">
 <div class="row">
   <% if current_user and @user.id == current_user.id %>
     <div class="col-md order-md-last">

-      <% if !@user.has_home? %>
-        <div id="map" class="content_map border border-grey">
+      <% if !@user.home_location? %>
+        <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 z-0", :data => { :user => user_data } %>

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


@@ -27,7 +27,7 @@
     </div>
 
     <div class="col-md">
     </div>
 
     <div class="col-md">

-      <h3><%= t ".my friends" %></h3>
+      <h2><%= t ".my friends" %></h2>

 
       <% if friends.empty? %>
         <%= t ".no friends" %>
 
       <% if friends.empty? %>
         <%= t ".no friends" %>


@@ -38,14 +38,14 @@
             <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
           </ul>
         </nav>
             <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
           </ul>
         </nav>

-        <div id="friends-container">
+        <div>

           <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
         </div>
       <% end %>
 
       <hr>
 
           <%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
         </div>
       <% end %>
 
       <hr>
 

-      <h3><%= t ".nearby users" %></h3>
+      <h2><%= t ".nearby users" %></h2>

 
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>
 
       <% if nearby.empty? %>
         <%= t ".no nearby users" %>