diff --git a/source/_patterns/04-components/card/_card.scss b/source/_patterns/04-components/card/_card.scss index df115fdf4e50e9229f04509b4cc3780a66d39625..4454ebc612d216b8a1ef2639b567d44c56e58967 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--node/_card--node.twig b/source/_patterns/04-components/card/card--node/_card--node.twig index b94b731d645b7c12f0865bbc1df06bcaf7087e0b..2eeeb815a1a2f61de3c95a8dbaf5ef59166fd24d 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-elements/_header.twig b/source/_patterns/04-components/card/card-elements/_header.twig index 88e6d22edcd1d3f9cb27d86aa03d0c5c9e9cd0e1..048a390fad260eb8481b39300ed34cfa53680096 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 add0275bb7f2773a6d8c4f3006f3fba5e6b61a67..bd22c7e6a7294bed43d7a0dbc43279e75cbad2d1 100644 --- a/source/_patterns/04-components/card/card.twig +++ b/source/_patterns/04-components/card/card.twig @@ -31,6 +31,8 @@ } %} {% endif %} + + {% if header and show_header == 'yes' %} {% include '@components/card/card-elements/_header.twig' with { 'header': header, diff --git a/source/_patterns/04-components/icon/_icon.scss b/source/_patterns/04-components/icon/_icon.scss index 8a47b1782c5c196b50dfff28ef06e7dd436c18e7..1db7061a2d447de98428ae7570524d78eb81510e 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 c6e73a82b2f92b52d1fc044d339d90d86417cd59..0f1f4e6d2b2fd331f32e88e67dd8311547bbb8f5 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 c7c06dfb1a0647472ff9ade8ad4da32895985dcc..27c82f7fc48bb9a0c6e7b1629455ca81f4290cd4 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 96dae89a828d4c5490d18c1fd85b990d4e072edc..42d5fd5967304b779afdc27e309ce69d102bbd70 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/svg/icons/_rss.svg.twig b/source/_patterns/04-components/svg/icons/_rss.svg.twig index b6612ef397347cde78f025626f84c4988f38e3b8..8e4c6a8e4d3d7f47c56cec2addbcf596009361ce 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 44f776bd631b41965a61b0b8079998095df85098..eff332799e4b6924e629fa39ff67ef92f84f18df 100644 --- a/source/_patterns/04-components/view/view-interact/view-interact.twig +++ b/source/_patterns/04-components/view/view-interact/view-interact.twig @@ -10,12 +10,13 @@ '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', + 'name': 'ical', 'is_hidden': false, + 'is_download': true, 'modifier_classes': 'icon--button', } %} {% endif %} 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 2f918791764301785d770e13efc6ecbb955db3ae..5f1581c3644e309de9f6c7b2ba113fd69de81dca 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,3 @@ exposed: true -calendar: true +ical: true rss_feed: true