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

fix(style): synced stepper with pattern library #1251

Merged
merged 9 commits into from
Jan 23, 2024
Merged

fix(style): synced stepper with pattern library #1251

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
33cc2c2
feat: added checkmark to indicated complited
orest-s Oct 19, 2023
382a540
feat: synced circle-size/colors/gap/differences for dark/light theme
orest-s Oct 19, 2023
8690726
Merge branch 'develop' into feat/sync-stepper-with-uxpin
scurker Oct 24, 2023
688ab98
Update packages/react/src/components/Stepper/index.tsx
orest-s Nov 15, 2023
c3a79a1
Update packages/react/src/components/Stepper/index.tsx
orest-s Nov 15, 2023
bd7a002
Update packages/styles/stepper.css
orest-s Nov 15, 2023
6f6081f
fix: refactored code on new style and fixed minor nits with using ::b…
orest-s Nov 15, 2023
ec8cd06
Merge branch 'develop' into feat/sync-stepper-with-uxpin
scurker Nov 16, 2023
6407628
fix: changed em to rem
orest-s Dec 22, 2023
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
36 changes: 32 additions & 4 deletions packages/react/src/components/Stepper/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types';
import classNames from 'classnames';
import TooltipTabstop from '../TooltipTabstop';
import Icon from '../Icon';

interface BaseStepProps extends React.LiHTMLAttributes<HTMLLIElement> {
status: 'current' | 'complete' | 'future';
Expand Down Expand Up @@ -45,7 +46,12 @@ export const Step = (props: StepProps) => {
aria-current={status === 'current' ? 'step' : 'false'}
{...liProps}
>
<div className="Stepper__step-line" />
<div
className={classNames(
'Stepper__step-line',
`Stepper__step--${status}-line`
)}
/>
<div className="Stepper__step-content">
{isTooltip ? (
<TooltipTabstop
Expand All @@ -59,13 +65,35 @@ export const Step = (props: StepProps) => {
association="aria-labelledby"
aria-label={tooltipText}
>
<div className="Stepper__step-indicator" />
<div
className={classNames(
'Stepper__step-indicator',
`Stepper__step--${status}-indicator`
)}
>
{status === 'complete' && <Icon type={'check'} />}
</div>
</TooltipTabstop>
) : (
<>
<div className="Stepper__step-indicator" />
<div
className={classNames(
'Stepper__step-indicator',
`Stepper__step--${status}-indicator`
)}
>
{status === 'complete' && <Icon type={'check'} />}
</div>

{children ? (
<div className="Stepper__step-label">{children}</div>
<div
className={classNames(
'Stepper__step-label',
`Stepper__step--${status}-label`
)}
>
{children}
</div>
) : null}
</>
)}
Expand Down
123 changes: 77 additions & 46 deletions packages/styles/stepper.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,58 @@
.Stepper {
--step-indicator-size: 2em;
:root {
--step-indicator-size: 1.867em;
--step-line-height: 0.53em;
--step-line-offset: 1.33em;
--step-line-offset: 1.53em;
scurker marked this conversation as resolved.
Show resolved Hide resolved

--step-indicator-content-size: 1.067em;

--step-label-color: var(--gray-60);
--step-line-color: var(--accent-light);
--step-indicator-background: var(--accent-light);
--step-indicator-color: var(--gray-90);

--step-current-indicator-background: #fff;
--step-current-indicator-color: var(--accent-dark);
--step-current-indicator-shadow: 0 0 0 2px var(--accent-dark);
--step-current-complete-line-border-color: var(--accent-dark);

--step-complete-indicator-background: var(--accent-dark);
--step-complete-indicator-color: #fff;

--step-current-label-color: var(--gray-90);
--step-complete-indicator-svg-color: var(--accent-success);

--stepper-color: var(--gray-90);
}

/* Dark theme variables */
.cauldron--theme-dark {
--step-label-color: var(--accent-light);
--step-line-color: var(--accent-medium);
--step-indicator-color: #fff;
--step-indicator-background: var(--accent-medium);

--step-current-indicator-background: #fff;
--step-current-indicator-color: var(--accent-dark);
--step-current-indicator-shadow: 0 0 0 2px var(--accent-dark),
0 0 0 4px var(--accent-info);
--step-current-complete-line-border-color: var(--accent-info);

--step-complete-indicator-background: var(--accent-info);
--step-complete-indicator-color: var(--accent-dark);

--step-current-label-color: #fff;
--step-complete-indicator-svg-color: #000;

--stepper-color: var(--accent-light);
--stepper-background-color: var(--accent-dark);
}

.Stepper {
display: flex;
padding: var(--space-medium);
align-items: flex-start;
color: var(--gray-90);
color: var(--stepper-color);
background-color: var(--stepper-background-color);
counter-reset: stepper;
list-style-type: none;
margin: 0 auto;
Expand All @@ -24,7 +70,7 @@
left: calc(-50% + var(--step-line-offset));
right: calc(50% + var(--step-line-offset));
flex: 1 1 auto;
border-top: var(--step-line-height) solid var(--accent-light);
border-top: var(--step-line-height) solid var(--step-line-color);
}

.Stepper__step:first-child .Stepper__step-line {
Expand All @@ -41,16 +87,16 @@
width: var(--step-indicator-size);
height: var(--step-indicator-size);
border-radius: 50%;
background: var(--accent-light);
color: var(--gray-90);
background: var(--step-indicator-background);
color: var(--step-indicator-color);
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
}

.Stepper__step-indicator::before {
font-size: var(--text-size-smallest);
.Stepper__step-indicator:before {
font-size: var(--text-size-small);
counter-increment: stepper;
content: counter(stepper);
}
Expand All @@ -60,59 +106,44 @@
width: 100%;
padding-top: var(--space-smallest);
font-size: var(--text-size-smaller);
color: var(--step-label-color);
}

/*
status-specific styles
*/

.Stepper__step--current .Stepper__step-indicator {
background: var(--white);
color: var(--accent-dark);
box-shadow: 0 0 0 2px var(--accent-dark);
}

.Stepper__step--current .Stepper__step-label {
font-weight: var(--font-weight-bold);
}

.Stepper__step--current .Stepper__step-line,
.Stepper__step--complete .Stepper__step-line {
border-color: var(--accent-dark);
}

.Stepper__step--complete .Stepper__step-indicator {
background: var(--accent-dark);
color: var(--white);
.Stepper__step--current-indicator {
background: var(--step-current-indicator-background);
color: var(--step-current-indicator-color);
box-shadow: var(--step-current-indicator-shadow);
}

/* Dark Theme */
.cauldron--theme-dark .Stepper {
color: var(--accent-light);
background-color: var(--accent-dark);
.Stepper__step--current-indicator:before {
font-weight: var(--font-weight-medium);
}

.cauldron--theme-dark .Stepper__step-line {
border-top: var(--step-line-height) solid var(--accent-medium);
.Stepper__step--current-label {
font-weight: var(--font-weight-medium);
color: var(--step-current-label-color);
}

.cauldron--theme-dark .Stepper__step-indicator {
color: var(--white);
background: var(--accent-medium);
.Stepper__step--current-line,
.Stepper__step--complete-line {
border-color: var(--step-current-complete-line-border-color);
}

.cauldron--theme-dark .Stepper__step--current .Stepper__step-indicator {
background: var(--white);
color: var(--accent-dark);
box-shadow: 0 0 0 2px var(--accent-dark), 0 0 0 4px var(--accent-info);
.Stepper__step--complete-indicator {
background: var(--step-complete-indicator-background);
color: var(--step-complete-indicator-color);
}

.cauldron--theme-dark .Stepper__step--current .Stepper__step-line,
.cauldron--theme-dark .Stepper__step--complete .Stepper__step-line {
border-color: var(--accent-info);
.Stepper__step--complete-indicator:before {
content: '';
}

.cauldron--theme-dark .Stepper__step--complete .Stepper__step-indicator {
background: var(--accent-info);
color: var(--accent-dark);
.Stepper__step--complete-indicator svg {
height: var(--step-indicator-content-size);
width: var(--step-indicator-content-size);
color: var(--step-complete-indicator-svg-color);
}