From f42c8733e33a11ffe3009d7d5598c09607b3f9e7 Mon Sep 17 00:00:00 2001
From: Martin Leblanc <m26lebla@uwaterloo.ca>
Date: Thu, 18 Nov 2021 18:27:24 +0000
Subject: [PATCH] ISTWCMS-5195:additional css for the card tag output in teaser
---
.../00-config/_design-tokens.artifact.scss | 2 +-
.../_patterns/04-components/banners/banners.yml | 13 ++++++++++---
source/_patterns/04-components/card/_card.scss | 3 +--
.../card/card--banner/card--banner.yml | 5 ++---
.../card/card--node/_card--node.scss | 11 ++++++++++-
.../card/card--teaser/_card--teaser.scss | 16 ++++++++++++++++
6 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/source/_patterns/00-config/_design-tokens.artifact.scss b/source/_patterns/00-config/_design-tokens.artifact.scss
index d2ef2e77..8e7f094b 100644
--- a/source/_patterns/00-config/_design-tokens.artifact.scss
+++ b/source/_patterns/00-config/_design-tokens.artifact.scss
@@ -503,4 +503,4 @@ $gesso: (
xxl: 96px,
),
gutter-width: 40px,
-);
+);
\ No newline at end of file
diff --git a/source/_patterns/04-components/banners/banners.yml b/source/_patterns/04-components/banners/banners.yml
index ba26c36a..62877eeb 100644
--- a/source/_patterns/04-components/banners/banners.yml
+++ b/source/_patterns/04-components/banners/banners.yml
@@ -24,9 +24,10 @@ banners:
type: 'image/jpeg'
img_element: '../../../../source/images/president/president_xlarge.jpg'
alt: 'Alternative text'
- big_text: 'Image1'
- small_text: 'Caption 1'
link: 'http://google.ca'
+ big_text: 'President Goel leads Waterloo into bold new futures'
+ small_text: 'Vivek Goel officially installed as the University of Waterloo’s seventh president and vice-chancellor'
+ faculty: 'org-default'
-
sources:
- srcset: '../../../../source/images/president/president_xlarge.jpg'
@@ -46,7 +47,10 @@ banners:
type: 'image/jpeg'
img_element: '../../../../source/images/president/president_xlarge.jpg'
alt: 'Alternative text'
- small_text: 'Image2'
+ link: 'http://google.ca'
+ big_text: 'President Goel leads Waterloo into bold new futures'
+ small_text: 'Vivek Goel officially installed as the University of Waterloo’s seventh president and vice-chancellor'
+ faculty: 'org-mat'
-
sources:
- srcset: '../../../../source/images/president/president_xlarge.jpg'
@@ -67,6 +71,9 @@ banners:
img_element: '../../../../source/images/president/president_xlarge.jpg'
alt: 'Alternative text'
link: 'http://google.ca'
+ big_text: 'President Goel leads Waterloo into bold new futures'
+ small_text: 'Vivek Goel officially installed as the University of Waterloo’s seventh president and vice-chancellor'
+ faculty: 'org-sci'
autoplay: 1
slide_speed: 7000
style: 'full-width'
diff --git a/source/_patterns/04-components/card/_card.scss b/source/_patterns/04-components/card/_card.scss
index 92bcb810..f2ac603b 100644
--- a/source/_patterns/04-components/card/_card.scss
+++ b/source/_patterns/04-components/card/_card.scss
@@ -8,8 +8,7 @@ $card-meta-color: gesso-color(ui, generic, text-dark) !default;
$card-padding: rem(gesso-spacing(sm)) !default;
.card {
- @include uw-flex-grid(card);
- //background:$test-color-1;
+
width: 100%;
.views-row &{
diff --git a/source/_patterns/04-components/card/card--banner/card--banner.yml b/source/_patterns/04-components/card/card--banner/card--banner.yml
index 84585205..d97975c0 100644
--- a/source/_patterns/04-components/card/card--banner/card--banner.yml
+++ b/source/_patterns/04-components/card/card--banner/card--banner.yml
@@ -24,7 +24,6 @@ banners:
type: 'image/jpeg'
img_element: '../../../../source/images/president/original.jpg'
alt: 'Alternative text'
- big_text: 'Image1'
- small_text: 'Caption 1'
- link: 'http://google.ca'
+ big_text: 'President Goel leads Waterloo into bold new futures'
+ small_text: 'Vivek Goel officially installed as the University of Waterloo’s seventh president and vice-chancellor'
faculty: 'org-default'
diff --git a/source/_patterns/04-components/card/card--node/_card--node.scss b/source/_patterns/04-components/card/card--node/_card--node.scss
index 6865e64a..c4e58e17 100644
--- a/source/_patterns/04-components/card/card--node/_card--node.scss
+++ b/source/_patterns/04-components/card/card--node/_card--node.scss
@@ -6,7 +6,7 @@
}
.uw-node__without-image &{
.card__header,
- .card__footer {
+ .card__footer{
margin:0 auto;
max-width: $max-width;
padding: 0 gesso-spacing(sm);
@@ -15,8 +15,17 @@
}
}
}
+ .card__tags{
+ margin:1rem auto;
+ max-width: $max-width;
+ padding: 0 gesso-spacing(sm);
+ @include xl{
+ padding: 0;
+ }
+ }
.card__footer{
margin-bottom: rem(gesso-spacing(md));
+ margin-top:auto;
padding: 0 gesso-spacing(sm);
@include xl{
padding: 0;
diff --git a/source/_patterns/04-components/card/card--teaser/_card--teaser.scss b/source/_patterns/04-components/card/card--teaser/_card--teaser.scss
index c2b93564..f28723d2 100644
--- a/source/_patterns/04-components/card/card--teaser/_card--teaser.scss
+++ b/source/_patterns/04-components/card/card--teaser/_card--teaser.scss
@@ -1,8 +1,24 @@
.card__teaser{
+ @include uw-flex-grid(card);
+
+ .views-row &{
+ height:100%;
+ }
+ .uw-label{
+ display:block;
+ margin-top:1rem;
+ }
+ .card__tags{
+ margin:inherit;
+ margin-top: auto;
+ padding: 0;
+ }
+
.uw-node__without-image &{
.card__header,
.card__footer {
padding: 0;
}
}
+
}
--
GitLab