Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Flow Steps: Vertical variant #254

Merged
merged 7 commits into from
Aug 6, 2020
Merged

Flow Steps: Vertical variant #254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
21e77a0
Add vertical variant to Flow Steps component
havgry Jul 7, 2020
8521aec
Update documentation
havgry Jul 7, 2020
aa6c1aa
Remove redundant properties
havgry Jul 7, 2020
1957381
Fix values and update initial value of reference
havgry Aug 3, 2020
9e4858e
Allow multiple "active" bullets
havgry Aug 3, 2020
c8be5c3
Remove refs
havgry Aug 5, 2020
6bf2887
Unflex vertical variant and increase distance between items
havgry Aug 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 35 additions & 8 deletions src/assets/scss/elements/ys-flow-steps.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,27 @@
@import '../tools/ys-functions';

.ys-flow-steps {
$bullet-size-px: 34;
color: $ys-color-grey-28;

&__list {
margin: 0;
padding: 0;
list-style: none;
display: flex;
flex-flow: row;
counter-reset: progress-bullet;
text-align: center;

.ys-flow-steps--vertical & {
display: initial;
text-align: left;
}
}

&__item {
position: relative;
flex: 1 0 10px;
padding-top: rem(34);
flex: 1 0;
padding-top: rem($bullet-size-px);
font-size: rem(14);
counter-increment: progress-bullet;
list-style-type: none;
Expand All @@ -28,6 +33,14 @@
padding-top: rem(42);
}

.ys-flow-steps--vertical & {
display: flex;
padding-top: 0;
padding-left: rem(48);
align-items: center;
height: rem(64);
}

// ::before is the line in the bg
&::before {
content: '';
Expand All @@ -38,6 +51,13 @@
height: rem(2);
width: 100%;
background-color: $ys-color-digital-moss;

.ys-flow-steps--vertical & {
height: 100%;
width: rem(2);
top: -50%;
left: rem($bullet-size-px / 2 - 1);
}
}

&:first-child::before {
Expand All @@ -46,13 +66,14 @@

// ::after is the actual "bullets"
&::after {
$bullet-center-point: calc(50% - #{rem($bullet-size-px / 2)});
content: '';
position: absolute;
z-index: 1;
top: 0;
left: calc(50% - #{rem(17)});
width: rem(34);
height: rem(34);
left: $bullet-center-point;
width: rem($bullet-size-px);
height: rem($bullet-size-px);
border-radius: 50%;
background: $ys-color-digital-moss url('data:image/svg+xml,%3Csvg viewBox%3d%22-1 -2 16 16%22 xmlns%3d%22http://www.w3.org/2000/svg%22%3E%3Cpath fill%3d%22none%22 fill-rule%3d%22evenodd%22 stroke%3d%22%23fff%22 stroke-linecap%3d%22round%22 stroke-linejoin%3d%22round%22 stroke-width%3d%222%22 d%3d%22M1 6.16534L5.68013 11 13 1%22/%3E%3C/svg%3E') no-repeat center;
background-size: 14px 14px;
Expand All @@ -61,10 +82,14 @@
font-size: rem(16);
line-height: rem(30);
font-weight: 600;

.ys-flow-steps--vertical & {
left: 0;
top: $bullet-center-point;
}
}

&--active {

// Change color of line
& ~ .ys-flow-steps__item::before {
background-color: $ys-color-grey-28;
Expand All @@ -80,7 +105,7 @@
}

// "Bullets" after the active "bullet"
& ~ .ys-flow-steps__item::after {
& ~ .ys-flow-steps__item:not(.ys-flow-steps__item--active)::after {
content: counter(progress-bullet);
background-color: $ys-color-white;
background-image: none;
Expand All @@ -93,7 +118,9 @@
&__label {
font-weight: 600;
line-height: rem(20);
}

&:not(.ys-flow-steps--vertical) &__label {
@media screen and (max-width: $ys-breakpoint-md) {
display: none;
}
Expand Down
9 changes: 9 additions & 0 deletions src/docs/01-Components/06-Feedback/03-flow-steps.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ secondaryKeywords: minvalue maxvalue valuemax valuemin
{{render '@flow-steps'}}
```

## Vertical flow steps
<div class="element-preview">
<div class="element-preview__inner">{{render '@flow-steps--vertical'}}</div>
</div>

```html
{{render '@flow-steps--vertical'}}
```

# HTML Guidelines

# UX and Design Guidelines
Expand Down
8 changes: 8 additions & 0 deletions src/elements/02-elements/flow-steps/flow-steps.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@ module.exports = {
status: "wip",
preview: "@element-preview",
label: "Flow Steps",
isVertical: false,
variants: [
{
name: "default",
label: "Flow Steps"
},
{
name: "vertical",
label: "Flow Steps Vertical",
context: {
isVertical: true
}
}
],
"context": {
Expand Down
2 changes: 1 addition & 1 deletion src/elements/02-elements/flow-steps/flow-steps.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div class="ys-flow-steps" role="progressbar" aria-valuenow="3"
<div class="ys-flow-steps{{#if isVertical}} ys-flow-steps--vertical{{/if}}" role="progressbar" aria-valuenow="3"
aria-valuemin="0" aria-valuetext="Task description" aria-valuemax="5">
<ol class="ys-flow-steps__list" aria-hidden="true">
<li class="ys-flow-steps__item">
Expand Down