From a8537f7e19c0e54c6958a4ef9b8353edffa3d79f Mon Sep 17 00:00:00 2001 From: decabeza Date: Tue, 14 Apr 2020 17:14:52 +0200 Subject: [PATCH] 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 @@
+ class="card small-12 medium-<%= card.columns %> column margin-bottom end"> <%= link_to card.link_url do %>
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 @@ -
- <% @cards.find_each do |card| %> - <%= render "card", card: card %> - <% end %> +
+
+ <% @cards.find_each do |card| %> + <%= render "card", card: card %> + <% end %> +
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 @@
+ class="card small-12 medium-<%= card.columns %> column margin-bottom end"> <%= link_to card.link_url do %>
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 @@

<%= t("welcome.cards.title") %>

-
- <% @cards.each do |card| %> - <%= render "card", card: card %> - <% end %> +
+
+ <% @cards.each do |card| %> + <%= render "card", card: card %> + <% end %> +