diff --git a/source/_patterns/00-config/_design-tokens.artifact.scss b/source/_patterns/00-config/_design-tokens.artifact.scss index d2ef2e7796aae70405654024d45884002b23a5a6..8e7f094b17029ab5820275f2b390c70be33c2e0f 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 ba26c36a4477b7d2ef5a6499b82fc7d7281fbe48..62877eeb981da7ca6009250a604ac3646684b0b4 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 92bcb8101b17e06234092a25c96392e51ade2cfe..f2ac603b16a1dab1671c16e28b79508a6892cedd 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 84585205e8a3da23ed138834ee5393924dc1135a..d97975c0007c780990f7dcd08501964d9e2cb72e 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 6865e64abf4e5948ae390fc46e67eec0d52c4d84..c4e58e1734af514bd2d90059822258fb229f0550 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 c2b9356463eeb497d48f207313f076f6bfac926c..f28723d24f0ae8140b4134f4a171bd1dc3b0a51e 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; } } + }