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(loader): update names #8924

Merged
merged 3 commits into from
Mar 12, 2024
Merged

fix(loader): update names #8924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26879b6
fix(loader): update component token names
alisonailea Mar 7, 2024
c3971f9
fix(action, block, card, scrim): rename loader sub-component tokens
alisonailea Mar 9, 2024
1cc1d9e
Merge branch 'epic/7180-component-tokens' of github.com:Esri/calcite-…
alisonailea Mar 12, 2024
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
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/action/action.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ button {
}

calcite-loader {
--calcite-loader-color-one-third: var(--calcite-action-loader-color-one-third);
--calcite-loader-color-middle: var(--calcite-action-loader-color-one-third);
--calcite-loader-color-start: var(--calcite-action-loader-color-start);
--calcite-loader-color-two-thirds: var(--calcite-action-loader-color-two-thirds);
--calcite-loader-color-end: var(--calcite-action-loader-color-two-thirds);
}

@include base-component();
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/block/block.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,9 +205,9 @@ calcite-icon {
}

calcite-loader {
--calcite-loader-color-one-third: var(--calcite-block-loader-color-one-third);
--calcite-loader-color-middle: var(--calcite-block-loader-color-one-third);
--calcite-loader-color-start: var(--calcite-block-loader-color-start);
--calcite-loader-color-two-thirds: var(--calcite-block-loader-color-two-thirds);
--calcite-loader-color-end: var(--calcite-block-loader-color-two-thirds);
}

calcite-scrim {
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/card/card.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,9 +217,9 @@ slot[name="footer-end"]::slotted(*) {
}

calcite-loader {
--calcite-loader-color-one-third: var(--calcite-card-loader-color-one-third);
--calcite-loader-color-middle: var(--calcite-card-loader-color-one-third);
--calcite-loader-color-start: var(--calcite-card-loader-color-start);
--calcite-loader-color-two-thirds: var(--calcite-card-loader-color-two-thirds);
--calcite-loader-color-end: var(--calcite-card-loader-color-two-thirds);
}

@include base-component();
Expand Down
16 changes: 11 additions & 5 deletions packages/calcite-components/src/components/loader/loader.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
*
* These properties can be overridden using the component's tag as selector.
*
* @prop --calcite-loader-color-one-third: defines the color of a loader. Applies to --calcite-loader-color between 33% - 66% of the animation.
* @prop --calcite-loader-color-start: defines the starting color of a loader. Applies to --calcite-loader-color between 0% - 33% of the animation.
* @prop --calcite-loader-color-two-thirds: defines the color of a loader. Applies to --calcite-loader-color between 66% - 99% of the animation.
* @prop --calcite-loader-bar-width: [Deprecated] defines the width of the loader animation.
* @prop --calcite-loader-color-end: defines the color of a loader. Applies to --calcite-loader-color between 66% - 99% of the animation.
* @prop --calcite-loader-color-middle: defines the color of a loader. Applies to --calcite-loader-color between 33% - 66% of the animation.
* @prop --calcite-loader-color-start: defines the starting color of a loader. Applies to --calcite-loader-color between 0% - 33% of the animation.
* @prop --calcite-loader-font-size: [Deprecated] Specifies the font size of the loading percentage when type is `"determinate"`.
* @prop --calcite-loader-padding: [Deprecated] Specifies the padding of the loader.
* @prop --calcite-loader-size-inline: [Deprecated] The width and height of an inline loader.
Expand Down Expand Up @@ -225,10 +225,16 @@ $loader-circumference: ($loader-scale - (2 * $stroke-width)) * 3.14159;
--calcite-internal-loader-bar-color: var(--calcite-loader-color-start, var(--calcite-color-brand));
}
33% {
--calcite-internal-loader-bar-color: var(--calcite-loader-color-one-third, var(--calcite-color-brand-press));
--calcite-internal-loader-bar-color: var(
--calcite-loader-color-middle,
var(--calcite-loader-color-start, var(--calcite-color-brand-press))
);
}
66% {
--calcite-internal-loader-bar-color: var(--calcite-loader-color-two-thirds, var(--calcite-color-brand-hover));
--calcite-internal-loader-bar-color: var(
--calcite-loader-color-end,
var(--calcite-loader-color-middle, var(--calcite-loader-color-start, var(--calcite-color-brand-hover)))
);
}
100% {
--calcite-internal-loader-bar-color: var(--calcite-loader-color-start, var(--calcite-color-brand));
Expand Down
4 changes: 2 additions & 2 deletions packages/calcite-components/src/components/scrim/scrim.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@
}

calcite-loader {
--calcite-loader-color-one-third: var(--calcite-scrim-loader-color-one-third);
--calcite-loader-color-middle: var(--calcite-scrim-loader-color-one-third);
--calcite-loader-color-start: var(--calcite-scrim-loader-color-start);
--calcite-loader-color-two-thirds: var(--calcite-scrim-loader-color-two-thirds);
--calcite-loader-color-end: var(--calcite-scrim-loader-color-two-thirds);
}

@include base-component();
Loading