diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss
index b800eebf9..82aee720f 100644
--- a/app/assets/stylesheets/layout.scss
+++ b/app/assets/stylesheets/layout.scss
@@ -2787,11 +2787,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/_cards.html.erb b/app/views/pages/_cards.html.erb
deleted file mode 100644
index 31caa6dfc..000000000
--- a/app/views/pages/_cards.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-
- <% @cards.find_each do |card| %>
- <%= render "card", card: card %>
- <% end %>
-
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? %>
- <%= render "cards" %>
+ <%= render "shared/cards" %>
<% end %>
diff --git a/app/views/pages/_card.html.erb b/app/views/shared/_card.html.erb
similarity index 94%
rename from app/views/pages/_card.html.erb
rename to app/views/shared/_card.html.erb
index a15bf4d3b..4e6c1e459 100644
--- a/app/views/pages/_card.html.erb
+++ b/app/views/shared/_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/shared/_cards.html.erb b/app/views/shared/_cards.html.erb
new file mode 100644
index 000000000..34768aca7
--- /dev/null
+++ b/app/views/shared/_cards.html.erb
@@ -0,0 +1,7 @@
+
+
+ <% @cards.each do |card| %>
+ <%= render "shared/card", card: card %>
+ <% end %>
+
+
diff --git a/app/views/welcome/_card.html.erb b/app/views/welcome/_card.html.erb
deleted file mode 100644
index a15bf4d3b..000000000
--- a/app/views/welcome/_card.html.erb
+++ /dev/null
@@ -1,20 +0,0 @@
-
- <%= link_to card.link_url do %>
-
-
- <% if card.image.present? %>
- <%= image_tag(card.image_url(:large), alt: card.image.title) %>
- <% end %>
-
- <% if card.label.present? %>
- <%= card.label %>
- <% end %>
-
- <%= card.title %>
-
-
-
<%= card.description %>
-
<%= card.link_text %>
- <% end %>
-
diff --git a/app/views/welcome/_cards.html.erb b/app/views/welcome/_cards.html.erb
deleted file mode 100644
index 8a42521c4..000000000
--- a/app/views/welcome/_cards.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<%= t("welcome.cards.title") %>
-
-
- <% @cards.each do |card| %>
- <%= render "card", card: card %>
- <% end %>
-
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 @@
<% if @cards.any? %>
">
- <%= render "cards" %>
+
<%= t("welcome.cards.title") %>
+
+ <%= render "shared/cards" %>
<% end %>