From e81a3f5363b0bc34751bbf15e50c05b53d74cdf1 Mon Sep 17 00:00:00 2001 From: Paul Hebert Date: Fri, 16 Jul 2021 09:33:17 -0700 Subject: [PATCH 01/19] Start overview component --- src/components/button/button.scss | 1 + src/objects/overview/demo/advanced.twig | 28 +++++++++++++++++++ src/objects/overview/demo/basic.twig | 11 ++++++++ src/objects/overview/overview.scss | 22 +++++++++++++++ src/objects/overview/overview.stories.mdx | 33 +++++++++++++++++++++++ src/objects/overview/overview.twig | 14 ++++++++++ 6 files changed, 109 insertions(+) create mode 100644 src/objects/overview/demo/advanced.twig create mode 100644 src/objects/overview/demo/basic.twig create mode 100644 src/objects/overview/overview.scss create mode 100644 src/objects/overview/overview.stories.mdx create mode 100644 src/objects/overview/overview.twig diff --git a/src/components/button/button.scss b/src/components/button/button.scss index eee0cc24c..e9047fe1b 100644 --- a/src/components/button/button.scss +++ b/src/components/button/button.scss @@ -2,6 +2,7 @@ .c-button { @include button.default; + flex-grow: none; } /** diff --git a/src/objects/overview/demo/advanced.twig b/src/objects/overview/demo/advanced.twig new file mode 100644 index 000000000..1ecb76fdf --- /dev/null +++ b/src/objects/overview/demo/advanced.twig @@ -0,0 +1,28 @@ +{% embed '@cloudfour/objects/overview/overview.twig' %} + {% block header %} + {% include '@cloudfour/components/heading/heading.twig' with { + level: -1, + weight: "light", + content: 'More Topics', + } only %} + {% endblock %} + {% block actions %} + {# + In the future we could swap this out for the Input Group component + that's currently in the works. + #} + + {% endblock %} + {% block content %} +

+ Etiam et egestas lorem. Vivamus sagittis sit amet dolor quis lobortis. + Integer sed fermentum arcu, id vulputate lacus. Etiam fermentum sem eu + quam hendrerit. + Nam risus massa, ullamcorper consectetur eros fermentum, porta aliquet + ligula. Sed vel mauris nec enim. +

+ {% endblock %} +{% endembed %} diff --git a/src/objects/overview/demo/basic.twig b/src/objects/overview/demo/basic.twig new file mode 100644 index 000000000..76ab9864a --- /dev/null +++ b/src/objects/overview/demo/basic.twig @@ -0,0 +1,11 @@ +{% embed '@cloudfour/objects/overview/overview.twig' %} + {% block header %} + Header + {% endblock %} + {% block actions %} + Actions + {% endblock %} + {% block content %} + Content + {% endblock %} +{% endembed %} diff --git a/src/objects/overview/overview.scss b/src/objects/overview/overview.scss new file mode 100644 index 000000000..29ee645e2 --- /dev/null +++ b/src/objects/overview/overview.scss @@ -0,0 +1,22 @@ +@use "../../compiled/tokens/scss/breakpoint"; +@use '../../mixins/ms'; + +// TODO: Design tokens? + +.o-overview__header { + padding-bottom: ms.step(1); +} + +.o-overview__actions { + padding-bottom: ms.step(3); +} + +@media (min-width: breakpoint.$l) { + .o-overview { + display: grid; + grid-template-areas: " + header header actions + content content content + "; + } +} diff --git a/src/objects/overview/overview.stories.mdx b/src/objects/overview/overview.stories.mdx new file mode 100644 index 000000000..83547bd4e --- /dev/null +++ b/src/objects/overview/overview.stories.mdx @@ -0,0 +1,33 @@ +import { Story, Canvas, Meta } from '@storybook/addon-docs/blocks'; +import basicDemo from './demo/basic.twig'; +import advancedDemo from './demo/advanced.twig'; + + + + + +# Overview + +TODO + + + + {basicDemo.bind({})} + + + +# Advanced Usags + +TODO + + + + {advancedDemo.bind({})} + + diff --git a/src/objects/overview/overview.twig b/src/objects/overview/overview.twig new file mode 100644 index 000000000..f24d4cada --- /dev/null +++ b/src/objects/overview/overview.twig @@ -0,0 +1,14 @@ +{# TODO: More semantic elements #} +{# TODO: aria-labelledby? #} + +
+
+ {% block header %}{% endblock %} +
+
+ {% block actions %}{% endblock %} +
+
+ {% block content %}{% endblock %} +
+
From 7eabae6ecef909a61bce2b3c55771c539e82f16b Mon Sep 17 00:00:00 2001 From: Paul Hebert Date: Fri, 16 Jul 2021 11:07:15 -0700 Subject: [PATCH 02/19] Wrap up overview CSS --- src/objects/overview/overview.scss | 40 +++++++++++++++++++++++++----- 1 file changed, 34 insertions(+), 6 deletions(-) diff --git a/src/objects/overview/overview.scss b/src/objects/overview/overview.scss index 29ee645e2..65d62e5a7 100644 --- a/src/objects/overview/overview.scss +++ b/src/objects/overview/overview.scss @@ -1,22 +1,50 @@ @use "../../compiled/tokens/scss/breakpoint"; @use '../../mixins/ms'; +@use "../../compiled/tokens/scss/size"; +@use '../../mixins/fluid'; // TODO: Design tokens? .o-overview__header { - padding-bottom: ms.step(1); + margin-bottom: ms.step(1); } .o-overview__actions { - padding-bottom: ms.step(3); + margin-bottom: ms.step(3); } @media (min-width: breakpoint.$l) { .o-overview { + @include fluid.column-gap( + breakpoint.$s, + breakpoint.$xl, + size.$spacing-gap-fluid-min, + size.$spacing-gap-fluid-max + ); + + align-items: center; display: grid; - grid-template-areas: " - header header actions - content content content - "; + grid-template-areas: + 'header header actions' + 'content content content'; + grid-template-columns: repeat(3, minmax(max-content, 1fr)); + row-gap: ms.step(3); + } + + .o-overview__header, + .o-overview__actions { + margin: 0; + } + + .o-overview__header { + grid-area: header; + } + + .o-overview__actions { + grid-area: actions; + } + + .o-overview__content { + grid-area: content; } } From 4a09415ea48bfe4253c68b115f641c9f927bc80c Mon Sep 17 00:00:00 2001 From: Paul Hebert Date: Fri, 16 Jul 2021 11:07:34 -0700 Subject: [PATCH 03/19] Add advanced example --- src/objects/overview/demo/advanced.twig | 23 ++++++++++++++++------- src/objects/overview/overview.stories.mdx | 3 ++- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/objects/overview/demo/advanced.twig b/src/objects/overview/demo/advanced.twig index 1ecb76fdf..6154e8d77 100644 --- a/src/objects/overview/demo/advanced.twig +++ b/src/objects/overview/demo/advanced.twig @@ -17,12 +17,21 @@ {% endblock %} {% block content %} -

- Etiam et egestas lorem. Vivamus sagittis sit amet dolor quis lobortis. - Integer sed fermentum arcu, id vulputate lacus. Etiam fermentum sem eu - quam hendrerit. - Nam risus massa, ullamcorper consectetur eros fermentum, porta aliquet - ligula. Sed vel mauris nec enim. -

+ {% embed '@cloudfour/objects/list/list.twig' with { + "tag_name": "ul", + "class": "o-list--2-column@m o-list--3-column@l" + } %} + {% block content %} + {% for topic in topics %} +
  • + {% include '@cloudfour/components/dot-leader/dot-leader.twig' with { + label: topic.title, + count: topic.count, + href: 'https://cloudfour.com/thinks/' + } only %} +
  • + {% endfor %} + {% endblock %} + {% endembed %} {% endblock %} {% endembed %} diff --git a/src/objects/overview/overview.stories.mdx b/src/objects/overview/overview.stories.mdx index 83547bd4e..bd6dafd36 100644 --- a/src/objects/overview/overview.stories.mdx +++ b/src/objects/overview/overview.stories.mdx @@ -1,6 +1,7 @@ import { Story, Canvas, Meta } from '@storybook/addon-docs/blocks'; import basicDemo from './demo/basic.twig'; import advancedDemo from './demo/advanced.twig'; +import topics from '../../components/dot-leader/demo/topics.json';