diff --git a/.circleci/config.yml b/.circleci/config.yml
index 956b25c5298..63910ddc45b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@ executors:
parameters:
current_golden_images_hash:
type: string
- default: c3df2b2da5c455e279b0a4396c2b15ee164dd246
+ default: d722636bd94d3bb522dd578cfb7dc9403e093e98
wireit_cache_name:
type: string
default: wireit
diff --git a/packages/button/stories/index.ts b/packages/button/stories/index.ts
index 123ae314e2e..a576d0fff7a 100644
--- a/packages/button/stories/index.ts
+++ b/packages/button/stories/index.ts
@@ -116,35 +116,21 @@ export const makeOverBackground =
};
export function renderButton(properties: Properties): TemplateResult {
- if (properties.variant) {
- return html`
-
- ${properties.content || 'Click Me'}
-
- `;
- } else {
- return html`
-
- ${properties.content || 'Click Me'}
-
- `;
- }
+ return html`
+
+ ${properties.content || 'Click Me'}
+
+ `;
}
export function renderButtonSet(properties: Properties): TemplateResult {
diff --git a/packages/button/stories/template.ts b/packages/button/stories/template.ts
index eda44730af5..dc39df9a974 100644
--- a/packages/button/stories/template.ts
+++ b/packages/button/stories/template.ts
@@ -27,7 +27,6 @@ export interface Properties {
size?: 's' | 'm' | 'l' | 'xl';
href?: string;
target?: '_blank' | '_parent' | '_self' | '_top';
- warning?: boolean;
iconOnly?: boolean;
}
diff --git a/packages/progress-circle/src/progress-circle.css b/packages/progress-circle/src/progress-circle.css
index 2bcfe7e82cb..3320308f6ef 100644
--- a/packages/progress-circle/src/progress-circle.css
+++ b/packages/progress-circle/src/progress-circle.css
@@ -22,6 +22,7 @@ governing permissions and limitations under the License.
var(--_spectrum-progress-circle-size)
);
+ --spectrum-progress-circle-size: inherit;
--spectrum-progresscircle-m-over-background-track-fill-color: var(
--spectrum-alias-track-fill-color-overbackground
);
@@ -78,3 +79,11 @@ slot {
var(--_spectrum-progress-circle-size)
);
}
+
+/* stylelint-disable */
+:host([indeterminate]) .fills,
+:host([indeterminate]) .fillSubMask1,
+:host([indeterminate]) .fillSubMask2 {
+ animation-duration: var(--spectrum-animation-duration-2000);
+}
+/* stylelint-enable */
diff --git a/projects/story-decorator/src/StoryDecorator.ts b/projects/story-decorator/src/StoryDecorator.ts
index 473efc776f0..f327e066512 100644
--- a/projects/story-decorator/src/StoryDecorator.ts
+++ b/projects/story-decorator/src/StoryDecorator.ts
@@ -89,6 +89,7 @@ const reduceMotionProperties = css`
--spectrum-animation-duration-2000: 0ms;
--spectrum-animation-duration-4000: 0ms;
--spectrum-animation-duration-6000: 0ms;
+ --pending-delay: 0s;
--spectrum-coachmark-animation-indicator-ring-duration: 0ms;
--swc-test-duration: 1ms;
`;