From 7a75d27481053051cfd9b9db533f67ef9bbeb32a Mon Sep 17 00:00:00 2001 From: Andrew Nelson Date: Thu, 31 Jan 2019 19:28:32 -0500 Subject: [PATCH 1/3] feat(progress-indicator): adds 'vertical' variant --- .../_progress-indicator.scss | 35 + .../progress-indicator.config.js | 12 + .../progress-indicator/progress-indicator.hbs | 4 +- tests/axe/a11y-progress-indicator.json | 590 +- tests/axe/allHtml/a11y-html.json | 7036 ++++++++++++++++- 5 files changed, 7377 insertions(+), 300 deletions(-) diff --git a/src/components/progress-indicator/_progress-indicator.scss b/src/components/progress-indicator/_progress-indicator.scss index 605e764de6be..5772349c1c8a 100644 --- a/src/components/progress-indicator/_progress-indicator.scss +++ b/src/components/progress-indicator/_progress-indicator.scss @@ -121,6 +121,41 @@ height: rem(12px); width: rem(40px); } + + .#{$prefix}--progress--vertical { + display: block; + } + + .#{$prefix}--progress--vertical .#{$prefix}--progress-step { + display: list-item; + min-height: 3rem; + + svg { + display: inline-block; + } + } + + .#{$prefix}--progress--vertical .#{$prefix}--progress-label { + display: inline-block; + width: auto; + vertical-align: top; + margin-top: 0.26rem; + margin-left: 0.5rem; + } + + .#{$prefix}--progress--vertical .#{$prefix}--progress-line { + top: 22px; + left: 0.69rem; + height: calc(100% - 22px); + width: 1px; + } + + .#{$prefix}--progress--vertical .#{$prefix}--progress-step:first-child .#{$prefix}--progress-line { + display: block; + } + .#{$prefix}--progress--vertical .#{$prefix}--progress-step:last-child .#{$prefix}--progress-line { + display: none; + } } @mixin progress-indicator--x { diff --git a/src/components/progress-indicator/progress-indicator.config.js b/src/components/progress-indicator/progress-indicator.config.js index 417a21507755..031109f91d72 100644 --- a/src/components/progress-indicator/progress-indicator.config.js +++ b/src/components/progress-indicator/progress-indicator.config.js @@ -54,5 +54,17 @@ module.exports = { componentsX, }, }, + { + name: 'vertical', + label: 'Vertical', + context: { + vertical: true, + steps, + componentsX, + }, + meta: { + xVersionNotSupported: true, + }, + }, ], }; diff --git a/src/components/progress-indicator/progress-indicator.hbs b/src/components/progress-indicator/progress-indicator.hbs index ef61aa0fddda..8f12ba5eafa7 100644 --- a/src/components/progress-indicator/progress-indicator.hbs +++ b/src/components/progress-indicator/progress-indicator.hbs @@ -1,11 +1,11 @@ - -