From 62a2048b4acf5cdc728b479ef05fe744b822d5e5 Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Thu, 21 Apr 2022 16:08:07 -0400 Subject: [PATCH 1/6] ISTWCMS-5501: adding ical feed to views --- .../04-components/view/view-interact/view-interact.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/_patterns/04-components/view/view-interact/view-interact.twig b/source/_patterns/04-components/view/view-interact/view-interact.twig index 44f776bd..4b3a1aec 100644 --- a/source/_patterns/04-components/view/view-interact/view-interact.twig +++ b/source/_patterns/04-components/view/view-interact/view-interact.twig @@ -10,9 +10,9 @@ 'modifier_classes': 'icon--button view-filters__open', } %} {% endif %} - {% if calendar %} + {% if ical %} {% include '@components/icon/icon--button/icon--button.twig' with { - 'url': '#', + 'url': ical, 'text': 'Ical', 'name': 'calendar', 'is_hidden': false, -- GitLab From e4967251f44b82219bb88a8db927fe69c54983c5 Mon Sep 17 00:00:00 2001 From: Martin Leblanc Date: Fri, 6 May 2022 14:04:58 -0400 Subject: [PATCH 2/6] ISTWCMS-5501: rebase continue rss.svg and view interact --- source/_patterns/04-components/svg/icons/_rss.svg.twig | 2 +- .../04-components/view/view-interact/view-interact.twig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/_patterns/04-components/svg/icons/_rss.svg.twig b/source/_patterns/04-components/svg/icons/_rss.svg.twig index b6612ef3..8e4c6a8e 100644 --- a/source/_patterns/04-components/svg/icons/_rss.svg.twig +++ b/source/_patterns/04-components/svg/icons/_rss.svg.twig @@ -1,7 +1,7 @@ RSS - diff --git a/source/_patterns/04-components/view/view-interact/view-interact.twig b/source/_patterns/04-components/view/view-interact/view-interact.twig index 4b3a1aec..eff33279 100644 --- a/source/_patterns/04-components/view/view-interact/view-interact.twig +++ b/source/_patterns/04-components/view/view-interact/view-interact.twig @@ -14,8 +14,9 @@ {% include '@components/icon/icon--button/icon--button.twig' with { 'url': ical, 'text': 'Ical', - 'name': 'calendar', + 'name': 'ical', 'is_hidden': false, + 'is_download': true, 'modifier_classes': 'icon--button', } %} {% endif %} -- GitLab From 7dedf99b1e091f6db89abab7983c5fa83b1438e3 Mon Sep 17 00:00:00 2001 From: wodby Date: Fri, 29 Apr 2022 12:59:37 -0400 Subject: [PATCH 3/6] ISTWCMS-5501: css and changes , update ical svg, and twig logic for download attribute to be added to icon button when download is expected --- source/_patterns/04-components/icon/_icon.scss | 1 + .../04-components/icon/icon--button/_icon--button.scss | 2 ++ .../04-components/icon/icon--button/icon--button.twig | 4 ++-- source/_patterns/04-components/svg/icons/_ical.svg.twig | 8 ++++++-- .../04-components/view/view-interact/view-interact.yml | 3 ++- 5 files changed, 13 insertions(+), 5 deletions(-) diff --git a/source/_patterns/04-components/icon/_icon.scss b/source/_patterns/04-components/icon/_icon.scss index 8a47b178..1db7061a 100644 --- a/source/_patterns/04-components/icon/_icon.scss +++ b/source/_patterns/04-components/icon/_icon.scss @@ -4,6 +4,7 @@ align-items: center; display:inline-flex; height: 1.5rem; + line-height:normal; width: 1.5rem; svg { height: 1.5rem; diff --git a/source/_patterns/04-components/icon/icon--button/_icon--button.scss b/source/_patterns/04-components/icon/icon--button/_icon--button.scss index c6e73a82..0f1f4e6d 100644 --- a/source/_patterns/04-components/icon/icon--button/_icon--button.scss +++ b/source/_patterns/04-components/icon/icon--button/_icon--button.scss @@ -16,11 +16,13 @@ $icon-font-size-small: rem(gesso-font-size(0)) !default; font-weight: gesso-font-weight(regular); gap:0.25rem; height:3rem; + line-height:normal; padding:0 0.5rem; transition:background gesso-duration(short) gesso-easing(ease-in); .uw-icon { align-items: center; display:flex; + line-height:normal; svg { fill: gesso-brand(org-default,uw-black,'primary'); } diff --git a/source/_patterns/04-components/icon/icon--button/icon--button.twig b/source/_patterns/04-components/icon/icon--button/icon--button.twig index c7c06dfb..27c82f7f 100644 --- a/source/_patterns/04-components/icon/icon--button/icon--button.twig +++ b/source/_patterns/04-components/icon/icon--button/icon--button.twig @@ -3,7 +3,7 @@ {% for icon in icons %} {% if icon.url %} - + {% endif %} {% include '@components/icon/icon.twig' with { name: icon.name, @@ -26,7 +26,7 @@ {% if url %} - + {% endif %} {% include '@components/icon/icon.twig' with { name: name, diff --git a/source/_patterns/04-components/svg/icons/_ical.svg.twig b/source/_patterns/04-components/svg/icons/_ical.svg.twig index 96dae89a..42d5fd59 100644 --- a/source/_patterns/04-components/svg/icons/_ical.svg.twig +++ b/source/_patterns/04-components/svg/icons/_ical.svg.twig @@ -1,4 +1,8 @@ -ical - + Export this event to calendar + diff --git a/source/_patterns/04-components/view/view-interact/view-interact.yml b/source/_patterns/04-components/view/view-interact/view-interact.yml index 2f918791..f3c2d6a4 100644 --- a/source/_patterns/04-components/view/view-interact/view-interact.yml +++ b/source/_patterns/04-components/view/view-interact/view-interact.yml @@ -1,3 +1,4 @@ exposed: true -calendar: true +ical: true rss_feed: true + -- GitLab From 2d86c065623809fb47ae4a067e47041f2787107c Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Mon, 2 May 2022 11:38:46 -0400 Subject: [PATCH 4/6] ISTWCMS-5501: updating card to handle ical feed --- .../04-components/card/card--node/_card--node.twig | 1 + source/_patterns/04-components/card/card.twig | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/source/_patterns/04-components/card/card--node/_card--node.twig b/source/_patterns/04-components/card/card--node/_card--node.twig index b94b731d..2eeeb815 100644 --- a/source/_patterns/04-components/card/card--node/_card--node.twig +++ b/source/_patterns/04-components/card/card--node/_card--node.twig @@ -18,5 +18,6 @@ 'content': node.content, 'footer': node.footer, 'tags': node.tags, + 'ical': node.ical, } %} diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig index add0275b..ce3c99f7 100644 --- a/source/_patterns/04-components/card/card.twig +++ b/source/_patterns/04-components/card/card.twig @@ -31,6 +31,12 @@ } %} {% endif %} + {% if ical %} + {% include '@components/view/view-interact/view-interact.twig' with { + 'ical': ical + }%} + {% endif %} + {% if header and show_header == 'yes' %} {% include '@components/card/card-elements/_header.twig' with { 'header': header, -- GitLab From 4dff8dfaf5c3292a66839d1a9ad91dbc5c63f991 Mon Sep 17 00:00:00 2001 From: Eric Bremner Date: Mon, 2 May 2022 11:40:40 -0400 Subject: [PATCH 5/6] ISTWCMS-5501: coding standards --- .../_patterns/04-components/view/view-interact/view-interact.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/source/_patterns/04-components/view/view-interact/view-interact.yml b/source/_patterns/04-components/view/view-interact/view-interact.yml index f3c2d6a4..5f1581c3 100644 --- a/source/_patterns/04-components/view/view-interact/view-interact.yml +++ b/source/_patterns/04-components/view/view-interact/view-interact.yml @@ -1,4 +1,3 @@ exposed: true ical: true rss_feed: true - -- GitLab From 219856f6ddb64fc633218ed5cbded51e458c7fe3 Mon Sep 17 00:00:00 2001 From: Martin Leblanc Date: Mon, 2 May 2022 14:37:02 -0400 Subject: [PATCH 6/6] ISTWCMS-5501: move view-interact (ical) to card__header --- .../_patterns/04-components/card/_card.scss | 27 ++++++++++++++++++- .../card/card-elements/_header.twig | 7 +++++ source/_patterns/04-components/card/card.twig | 6 +---- 3 files changed, 34 insertions(+), 6 deletions(-) diff --git a/source/_patterns/04-components/card/_card.scss b/source/_patterns/04-components/card/_card.scss index df115fdf..4454ebc6 100644 --- a/source/_patterns/04-components/card/_card.scss +++ b/source/_patterns/04-components/card/_card.scss @@ -80,7 +80,32 @@ $card-padding: rem(gesso-spacing(sm)) !default; @include uw-no-breakout(); margin-bottom: rem(gesso-spacing(xs)); width: 100%; - + .card__node--event & { + display:grid; + grid-template-columns:1fr auto; + .card__author{ + grid-column: 1/2; + } + .card__date{ + grid-column: 1/2; + } + .card__title{ + grid-column: 1/2; + } + .view-interact{ + background-color: $uw-white; + grid-column: 2/3; + grid-row:2/3; + margin:0; + padding:1rem 1rem 0 0 ; + .uw-node__without-image & { + grid-column: 2/3; + grid-row:inherit; + margin-bottom:1rem; + padding:0; + } + } + } } .card__date { font-size: rem(gesso-font-size(0)); diff --git a/source/_patterns/04-components/card/card-elements/_header.twig b/source/_patterns/04-components/card/card-elements/_header.twig index 88e6d22e..048a390f 100644 --- a/source/_patterns/04-components/card/card-elements/_header.twig +++ b/source/_patterns/04-components/card/card-elements/_header.twig @@ -80,4 +80,11 @@ 'job_id': header.job_id } %} {% endif %} + + {% if ical %} + {% include '@components/view/view-interact/view-interact.twig' with { + 'ical': ical + }%} + {% endif %} + diff --git a/source/_patterns/04-components/card/card.twig b/source/_patterns/04-components/card/card.twig index ce3c99f7..bd22c7e6 100644 --- a/source/_patterns/04-components/card/card.twig +++ b/source/_patterns/04-components/card/card.twig @@ -31,11 +31,7 @@ } %} {% endif %} - {% if ical %} - {% include '@components/view/view-interact/view-interact.twig' with { - 'ical': ical - }%} - {% endif %} + {% if header and show_header == 'yes' %} {% include '@components/card/card-elements/_header.twig' with { -- GitLab