Skip to content

Update progress to support semantic variables #6919

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

Open
GZolla wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update progress to support semantic variables #6919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions components/progress/progress.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ class Progress extends LocalizeCoreElement(LitElement) {
}

progress {
--d2l-progress-color: var(--d2l-color-celestine);
--d2l-progress-color: var(--d2l-theme-brand-color-primary-default);
-moz-appearance: none;
-webkit-appearance: none;
appearance: none;
background-color: var(--d2l-color-gypsum);
box-shadow: inset 0 2px var(--d2l-color-mica);
background-color: var(--d2l-theme-background-color-interactive-secondary-default);
box-shadow: var(--d2l-theme-shadow-inset);
width: 100%;
}
.bar {
Expand Down Expand Up @@ -114,7 +114,7 @@ class Progress extends LocalizeCoreElement(LitElement) {
}

progress.complete {
--d2l-progress-color: var(--d2l-color-olivine);
--d2l-progress-color: var(--d2l-theme-status-color-success);
}
/* this is necessary to avoid white bleed over rounded corners in chrome and safari */
progress::-webkit-progress-bar {
Expand All @@ -137,7 +137,7 @@ class Progress extends LocalizeCoreElement(LitElement) {
.indeterminate-bar {
--d2l-progress-indeterminate-width: calc(100% / 3);
animation: 1450ms 50ms ease-in-out indeterminateState alternate infinite;
background-color: var(--d2l-color-celestine);
background-color: var(--d2l-theme-brand-color-primary-default);
height: 100%;
margin-inline-start: calc(var(--d2l-progress-indeterminate-width) * -0.75);
width: var(--d2l-progress-indeterminate-width);
Expand Down
7 changes: 6 additions & 1 deletion components/progress/test/progress.vdiff.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe('d2l-progress', () => {
<d2l-progress label="Complete" value="10" max="10" size="${size}"></d2l-progress>
</div>`, { rtl });

await expect(ele).to.be.golden();
await expect(ele).to.be.golden({ allColorModes: !rtl && size === 'medium' });
});
});

Expand All @@ -28,4 +28,9 @@ describe('d2l-progress', () => {
await expect(ele).to.be.golden();
});
});

it('indeterminate', async() => {
const ele = await fixture(html`<d2l-progress label="Indeterminate Progress"></d2l-progress>`);
await expect(ele).to.be.golden({ allColorModes: true });
});
});
Loading