Merge pull request #13438 from opf/fix/49595-activity-column-width

fix: Make activity page columns the same width
opf · Aug 10, 2023 · d6c5a6d · d6c5a6d
2 parents c7accc9 + 2d68d9f
commit d6c5a6d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/app/views/placeholder_users/show.html.erb b/app/views/placeholder_users/show.html.erb
@@ -43,7 +43,7 @@ See COPYRIGHT and LICENSE files for more details.
   <% end %>
 <% end %>
 
-<div class="grid-block medium-up-2">
+<div class="grid-block grid-block_double-column">
   <div class="grid-content">
     <%= call_hook :view_account_left_top, placeholder_user: @placeholder_user %>
 

diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb
@@ -53,7 +53,7 @@ See COPYRIGHT and LICENSE files for more details.
     </li>
   <% end %>
 <% end %>
-<div class="grid-block medium-up-2">
+<div class="grid-block grid-block_double-column">
   <div class="grid-content">
     <%= call_hook :view_account_left_top, user: @user %>
     <% if visible_user_information?(@user) %>

diff --git a/frontend/src/global_styles/layout/_grid.sass b/frontend/src/global_styles/layout/_grid.sass
@@ -262,6 +262,15 @@ $block-grid-max-size: 6 !default
     &, .grid-content
       overflow: visible
 
+  &_double-column
+    flex-wrap: wrap
+
+    > .grid-content
+      min-width: 300px
+      flex-basis: 50%
+      flex-shrink: 0
+      flex-grow: 1
+
 .grid-content
   @extend %child-core
   @include grid-content