From df301c8290d42079792b4657d92a09c7072f4a2f Mon Sep 17 00:00:00 2001
From: Aurelio <aurelio.ogliari@gmail.com>
Date: Fri, 16 Aug 2019 20:27:59 +0200
Subject: [PATCH] 3724 - Fix badges order on profile sidebar (#3729)

Make sure the layout is consistent when
rendering badges on the sidebar

fixes #3724
---
 app/views/articles/_badges_area.html.erb     | 5 +++--
 app/views/users/_sidebar_additional.html.erb | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/views/articles/_badges_area.html.erb b/app/views/articles/_badges_area.html.erb
index 073dd0a59..c93ab92d2 100644
--- a/app/views/articles/_badges_area.html.erb
+++ b/app/views/articles/_badges_area.html.erb
@@ -6,7 +6,6 @@
       z-index: 1;
       color: black;
       opacity: 1 !important;
-      float: left;
     }
 
     .badge-achievement-image {
@@ -35,12 +34,14 @@
       overflow: auto;
       min-height: 105px;
       overflow: visible;
+      display: grid;
+      grid-template-columns: 50% 50%;
     }
   </style>
   <div style="overflow: visible;padding-top:20px;">
     <div class="widget-body badge-widget">
       <% @user.badge_achievements.order("id DESC").includes(:badge).each do |achievement| %>
-        <a class="badge-achievement" style="<%= "float:right" if achievement.id.digits.first.even? %>" href="/badge/<%= achievement.badge.slug %>">
+        <a class="badge-achievement" href="/badge/<%= achievement.badge.slug %>">
           <img
             src="<%= cloudinary achievement.badge.badge_image_url, 180 %>"
             alt="<%= achievement.badge.title %>"
diff --git a/app/views/users/_sidebar_additional.html.erb b/app/views/users/_sidebar_additional.html.erb
index 823b2f571..5fe0c4982 100644
--- a/app/views/users/_sidebar_additional.html.erb
+++ b/app/views/users/_sidebar_additional.html.erb
@@ -22,8 +22,6 @@
         </div>
       </a>
     <% end %>
-    <% if @user.badge_achievements_count > 0 %>
-      <%= render "articles/badges_area" %>
-    <% end %>
+    <%= render "articles/badges_area" %>
   </div>
 </div>