From a8537f7e19c0e54c6958a4ef9b8353edffa3d79f Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Tue, 14 Apr 2020 17:14:52 +0200
Subject: [PATCH 1/2] Replace equalizer to display flex on cards

---
 app/assets/stylesheets/layout.scss |  7 +++++++
 app/views/pages/_card.html.erb     |  2 +-
 app/views/pages/_cards.html.erb    | 10 ++++++----
 app/views/welcome/_card.html.erb   |  2 +-
 app/views/welcome/_cards.html.erb  | 10 ++++++----
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index f054df7bc..81185898e 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -2788,11 +2788,18 @@ table {
     margin-top: rem-calc(-48);
   }
 
+  .cards-container {
+    display: flex;
+    flex-wrap: wrap;
+  }
+
   .card {
     border: 0;
+    flex-grow: 0;
     overflow: visible;
 
     a {
+      height: 100%;
 
       img {
         transition-duration: 0.3s;
diff --git a/app/views/pages/_card.html.erb b/app/views/pages/_card.html.erb
index a15bf4d3b..4e6c1e459 100644
--- a/app/views/pages/_card.html.erb
+++ b/app/views/pages/_card.html.erb
@@ -1,5 +1,5 @@
 <div id="<%= dom_id(card) %>"
-     class="card small-12 medium-<%= card.columns %> column margin-bottom end" data-equalizer-watch>
+     class="card small-12 medium-<%= card.columns %> column margin-bottom end">
   <%= link_to card.link_url do %>
     <figure class="figure-card">
       <div class="gradient"></div>
diff --git a/app/views/pages/_cards.html.erb b/app/views/pages/_cards.html.erb
index 31caa6dfc..47b4a1ee9 100644
--- a/app/views/pages/_cards.html.erb
+++ b/app/views/pages/_cards.html.erb
@@ -1,5 +1,7 @@
-<div class="row" data-equalizer data-equalizer-on="medium">
-  <% @cards.find_each do |card| %>
-    <%= render "card", card: card %>
-  <% end %>
+<div class="row">
+  <div class="cards-container">
+    <% @cards.find_each do |card| %>
+      <%= render "card", card: card %>
+    <% end %>
+  </div>
 </div>
diff --git a/app/views/welcome/_card.html.erb b/app/views/welcome/_card.html.erb
index a15bf4d3b..4e6c1e459 100644
--- a/app/views/welcome/_card.html.erb
+++ b/app/views/welcome/_card.html.erb
@@ -1,5 +1,5 @@
 <div id="<%= dom_id(card) %>"
-     class="card small-12 medium-<%= card.columns %> column margin-bottom end" data-equalizer-watch>
+     class="card small-12 medium-<%= card.columns %> column margin-bottom end">
   <%= link_to card.link_url do %>
     <figure class="figure-card">
       <div class="gradient"></div>
diff --git a/app/views/welcome/_cards.html.erb b/app/views/welcome/_cards.html.erb
index 8a42521c4..06f6d9ad3 100644
--- a/app/views/welcome/_cards.html.erb
+++ b/app/views/welcome/_cards.html.erb
@@ -1,7 +1,9 @@
 <h3 class="title"><%= t("welcome.cards.title") %></h3>
 
-<div class="row" data-equalizer data-equalizer-on="medium">
-  <% @cards.each do |card| %>
-    <%= render "card", card: card %>
-  <% end %>
+<div class="row">
+  <div class="cards-container">
+    <% @cards.each do |card| %>
+      <%= render "card", card: card %>
+    <% end %>
+  </div>
 </div>

From caedd21da87b4ef6d4d5f31abed9c9d93bd192b5 Mon Sep 17 00:00:00 2001
From: decabeza <alberto@decabeza.es>
Date: Tue, 21 Apr 2020 12:54:16 +0200
Subject: [PATCH 2/2] Move cards to shared partials

---
 app/views/pages/_cards.html.erb               |  7 -------
 app/views/pages/custom_page.html.erb          |  2 +-
 app/views/{pages => shared}/_card.html.erb    |  0
 app/views/{welcome => shared}/_cards.html.erb |  4 +---
 app/views/welcome/_card.html.erb              | 20 -------------------
 app/views/welcome/index.html.erb              |  4 +++-
 6 files changed, 5 insertions(+), 32 deletions(-)
 delete mode 100644 app/views/pages/_cards.html.erb
 rename app/views/{pages => shared}/_card.html.erb (100%)
 rename app/views/{welcome => shared}/_cards.html.erb (54%)
 delete mode 100644 app/views/welcome/_card.html.erb

diff --git a/app/views/pages/_cards.html.erb b/app/views/pages/_cards.html.erb
deleted file mode 100644
index 47b4a1ee9..000000000
--- a/app/views/pages/_cards.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="row">
-  <div class="cards-container">
-    <% @cards.find_each do |card| %>
-      <%= render "card", card: card %>
-    <% end %>
-  </div>
-</div>
diff --git a/app/views/pages/custom_page.html.erb b/app/views/pages/custom_page.html.erb
index cdd06f9e0..e88892ceb 100644
--- a/app/views/pages/custom_page.html.erb
+++ b/app/views/pages/custom_page.html.erb
@@ -20,7 +20,7 @@
 
   <% if @cards.any? %>
     <div class="small-12 column">
-      <%= render "cards" %>
+      <%= render "shared/cards" %>
     </div>
   <% end %>
 
diff --git a/app/views/pages/_card.html.erb b/app/views/shared/_card.html.erb
similarity index 100%
rename from app/views/pages/_card.html.erb
rename to app/views/shared/_card.html.erb
diff --git a/app/views/welcome/_cards.html.erb b/app/views/shared/_cards.html.erb
similarity index 54%
rename from app/views/welcome/_cards.html.erb
rename to app/views/shared/_cards.html.erb
index 06f6d9ad3..34768aca7 100644
--- a/app/views/welcome/_cards.html.erb
+++ b/app/views/shared/_cards.html.erb
@@ -1,9 +1,7 @@
-<h3 class="title"><%= t("welcome.cards.title") %></h3>
-
 <div class="row">
   <div class="cards-container">
     <% @cards.each do |card| %>
-      <%= render "card", card: card %>
+      <%= render "shared/card", card: card %>
     <% end %>
   </div>
 </div>
diff --git a/app/views/welcome/_card.html.erb b/app/views/welcome/_card.html.erb
deleted file mode 100644
index 4e6c1e459..000000000
--- a/app/views/welcome/_card.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-<div id="<%= dom_id(card) %>"
-     class="card small-12 medium-<%= card.columns %> column margin-bottom end">
-  <%= link_to card.link_url do %>
-    <figure class="figure-card">
-      <div class="gradient"></div>
-      <% if card.image.present? %>
-        <%= image_tag(card.image_url(:large), alt: card.image.title) %>
-      <% end %>
-      <figcaption>
-        <% if card.label.present? %>
-          <span><%= card.label %></span>
-        <% end %>
-        <br>
-        <h3><%= card.title %></h3>
-      </figcaption>
-    </figure>
-    <p class="description"><%= card.description %></p>
-    <p><%= card.link_text %></p>
-  <% end %>
-</div>
diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb
index edc93514d..35b557edc 100644
--- a/app/views/welcome/index.html.erb
+++ b/app/views/welcome/index.html.erb
@@ -21,7 +21,9 @@
   <div class="row">
     <% if @cards.any? %>
       <div class="small-12 column <%= "large-8" if feed_processes_enabled? %>">
-        <%= render "cards" %>
+        <h3 class="title"><%= t("welcome.cards.title") %></h3>
+
+        <%= render "shared/cards" %>
       </div>
     <% end %>