From 184b73581ca35bc684edc8cf4e31391d6d2e549d Mon Sep 17 00:00:00 2001
From: Ray Addams <ra730@cam.ac.uk>
Date: Mon, 17 Mar 2025 08:20:01 +0000
Subject: [PATCH 1/3] =?UTF-8?q?AM-447=20Height=20of=20link=20grid=20cards?=
=?UTF-8?q?=20is=20wrong=20=E2=80=93=C2=A0internal=20padding=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../link-grid/link-grid.stories.twig | 49 ++++++++++++++++++-
.../link-grid/link-with-description.twig | 4 +-
2 files changed, 50 insertions(+), 3 deletions(-)
diff --git a/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig b/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig
index 8e54a25..11f63da 100644
--- a/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig
+++ b/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig
@@ -22,7 +22,7 @@
%}
-{% story link_grid_1 with
+ {% story link_grid_1 with
{
name: '1. Default',
args: {
@@ -43,5 +43,52 @@
{% include '@cambridge_tailwind/components/link-grid/link-grid.twig' with { content: { field_link_grid_title: { 0: title }, field_link_grid_description: { 0: description }, field_list_of_links:list_of_links }, nested_paragraph_count: number_of_links } %}
{% endstory %}
+ {% story link_grid_2 with
+ {
+ name: '1. Mix of description and no description',
+ args: {
+ title: "Heading",
+ description: "Description of the whole link set",
+ field_link_url: '/home',
+ field_link_title: 'Link grid link',
+ link_description: "A link description"
+ }
+ } %}
+ {% set list_of_links %}
+ {% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
+ field_link_url,
+ field_link_title,
+ field_featured_links_description:
+ link_description
+ } %}
+ {% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
+ field_link_url,
+ field_link_title: "Special Students at Harvard University",
+ field_featured_links_description: false,
+ link_description
+ } %}
+ {% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
+ field_link_url,
+ field_link_title: "Visiting Student at Yale",
+ field_featured_links_description: false,
+ link_description
+ } %}
+ {% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
+ field_link_url,
+ field_link_title,
+ field_featured_links_description: field_featured_links_description ~ "Lorem ipsum dolor sit amet, consectetur adipiscing elit.",
+ link_description
+ } %}
+ {% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
+ field_link_url,
+ field_link_title,
+ field_featured_links_description:
+ link_description
+ } %}
+ {% endset %}
+ {# Here, use any Twig you want, including custom functions, filters, etc. #}
+ {% include '@cambridge_tailwind/components/link-grid/link-grid.twig' with { content: { field_link_grid_title: { 0: title }, field_link_grid_description: { 0: description }, field_list_of_links:list_of_links }, nested_paragraph_count: number_of_links } %}
+ {% endstory %}
+
{% endstories %}
diff --git a/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig b/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
index 45359dc..c57c947 100644
--- a/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
+++ b/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
@@ -11,9 +11,9 @@
{% set imageCardLinkClasses = cardLinkClasses() | spaceless | split(" ") %}
{% set linkId = field_link_title | truncate(10) | clean_unique_id %}
-<a href="{{ field_link_url }}" class="{{ imageCardLinkClasses | join(" ") }} py-20" aria-labelledby="link_grid_{{linkId}}_label" {% if field_featured_links_description %}aria-describedby="link_grid_{{linkId}}_desc"{% endif %}>
+<a href="{{ field_link_url }}" class="{{ imageCardLinkClasses | join(" ") }} py-20 flex flex-col justify-center gap-12" aria-labelledby="link_grid_{{linkId}}_label" {% if field_featured_links_description %}aria-describedby="link_grid_{{linkId}}_desc"{% endif %}>
<p class="text-style-heading-xs" id="link_grid_{{linkId}}_label">{{ field_link_title }}</p>
{% if field_featured_links_description %}
- <p class="text-text-tertiary text-style-body-sm pt-12" id="link_grid_{{linkId}}_desc">{{ field_featured_links_description }}</p>
+ <p class="text-text-tertiary text-style-body-sm" id="link_grid_{{linkId}}_desc">{{ field_featured_links_description }}</p>
{% endif %}
</a>
--
GitLab
From 662d2ed927edd19d06d32b5c75e0ce7a1472e00b Mon Sep 17 00:00:00 2001
From: Ray Addams <ra730@cam.ac.uk>
Date: Wed, 19 Mar 2025 07:52:34 +0000
Subject: [PATCH 2/3] =?UTF-8?q?CAMWEBPLAT-167=20Height=20of=20link=20grid?=
=?UTF-8?q?=20cards=20is=20wrong=20=E2=80=93=20internal=20padding=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/link-grid/link-grid.stories.twig | 17 ++++++++++++-----
.../link-grid/link-with-description.twig | 4 ++--
2 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig b/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig
index 11f63da..ac78986 100644
--- a/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig
+++ b/web/themes/custom/cambridge_tailwind/components/link-grid/link-grid.stories.twig
@@ -51,25 +51,32 @@
description: "Description of the whole link set",
field_link_url: '/home',
field_link_title: 'Link grid link',
- link_description: "A link description"
+ link_description: "A link description",
+ number_of_links: 6
}
} %}
{% set list_of_links %}
{% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
field_link_url,
- field_link_title,
- field_featured_links_description:
+ field_link_title: "Special Students at Harvard University",
+ field_featured_links_description: false,
link_description
} %}
{% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
field_link_url,
- field_link_title: "Special Students at Harvard University",
+ field_link_title: "Visiting Student at Yale",
field_featured_links_description: false,
link_description
} %}
{% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
field_link_url,
- field_link_title: "Visiting Student at Yale",
+ field_link_title: "Wikipedia page - Henry Fellowship",
+ field_featured_links_description: false,
+ link_description
+ } %}
+ {% include "@cambridge_tailwind/components/link-grid/link-with-description.twig" with {
+ field_link_url,
+ field_link_title: "Wikipedia page - Procter Fellowship",
field_featured_links_description: false,
link_description
} %}
diff --git a/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig b/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
index c57c947..45359dc 100644
--- a/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
+++ b/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
@@ -11,9 +11,9 @@
{% set imageCardLinkClasses = cardLinkClasses() | spaceless | split(" ") %}
{% set linkId = field_link_title | truncate(10) | clean_unique_id %}
-<a href="{{ field_link_url }}" class="{{ imageCardLinkClasses | join(" ") }} py-20 flex flex-col justify-center gap-12" aria-labelledby="link_grid_{{linkId}}_label" {% if field_featured_links_description %}aria-describedby="link_grid_{{linkId}}_desc"{% endif %}>
+<a href="{{ field_link_url }}" class="{{ imageCardLinkClasses | join(" ") }} py-20" aria-labelledby="link_grid_{{linkId}}_label" {% if field_featured_links_description %}aria-describedby="link_grid_{{linkId}}_desc"{% endif %}>
<p class="text-style-heading-xs" id="link_grid_{{linkId}}_label">{{ field_link_title }}</p>
{% if field_featured_links_description %}
- <p class="text-text-tertiary text-style-body-sm" id="link_grid_{{linkId}}_desc">{{ field_featured_links_description }}</p>
+ <p class="text-text-tertiary text-style-body-sm pt-12" id="link_grid_{{linkId}}_desc">{{ field_featured_links_description }}</p>
{% endif %}
</a>
--
GitLab
From 5c150addc8048e0122e9868dbbd796aa161303ff Mon Sep 17 00:00:00 2001
From: Ray Addams <ra730@cam.ac.uk>
Date: Fri, 21 Mar 2025 13:57:51 +0000
Subject: [PATCH 3/3] =?UTF-8?q?CAMWEBPLAT-167=20Height=20of=20link=20grid?=
=?UTF-8?q?=20cards=20is=20wrong=20=E2=80=93=20internal=20padding=20issues?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../components/link-grid/link-with-description.twig | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig b/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
index 45359dc..338c895 100644
--- a/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
+++ b/web/themes/custom/cambridge_tailwind/components/link-grid/link-with-description.twig
@@ -7,13 +7,16 @@
* field_featured_links_description
*/
#}
+
+{% set field_featured_links_description %}{{ field_featured_links_description }}{% endset %}
+
{% from '@cambridge_tailwind/components/link/link.twig' import cardLinkClasses %}
{% set imageCardLinkClasses = cardLinkClasses() | spaceless | split(" ") %}
{% set linkId = field_link_title | truncate(10) | clean_unique_id %}
-<a href="{{ field_link_url }}" class="{{ imageCardLinkClasses | join(" ") }} py-20" aria-labelledby="link_grid_{{linkId}}_label" {% if field_featured_links_description %}aria-describedby="link_grid_{{linkId}}_desc"{% endif %}>
+<a href="{{ field_link_url }}" class="{{ imageCardLinkClasses | join(" ") }} py-20" aria-labelledby="link_grid_{{linkId}}_label" {% if field_featured_links_description is not empty %}aria-describedby="link_grid_{{linkId}}_desc"{% endif %}>
<p class="text-style-heading-xs" id="link_grid_{{linkId}}_label">{{ field_link_title }}</p>
- {% if field_featured_links_description %}
+ {% if field_featured_links_description is not empty %}
<p class="text-text-tertiary text-style-body-sm pt-12" id="link_grid_{{linkId}}_desc">{{ field_featured_links_description }}</p>
{% endif %}
</a>
--
GitLab