diff --git a/packages/components/src/components/loading-spinner/__snapshots__/loading-spinner.spec.ts.snap b/packages/components/src/components/loading-spinner/__snapshots__/loading-spinner.spec.ts.snap index d1e9bf07f5..0444b83a68 100644 --- a/packages/components/src/components/loading-spinner/__snapshots__/loading-spinner.spec.ts.snap +++ b/packages/components/src/components/loading-spinner/__snapshots__/loading-spinner.spec.ts.snap @@ -15,7 +15,7 @@ exports[`LoadingSpinner should match snapshot 1`] = `
Loading
- +
diff --git a/packages/components/src/components/loading-spinner/loading-spinner.css b/packages/components/src/components/loading-spinner/loading-spinner.css index 76a217343f..82cb5bc539 100644 --- a/packages/components/src/components/loading-spinner/loading-spinner.css +++ b/packages/components/src/components/loading-spinner/loading-spinner.css @@ -11,8 +11,6 @@ --font-weight: var(--scl-font-weight-bold); --font-size: var(--scl-font-size-16); - --spacing: var(--scl-spacing-8); - --color-circle-primary: var(--scl-color-primary); --color-circle-primary-inner: var(--scl-color-grey-20); --color-text-primary: var(--scl-color-grey-60); @@ -55,11 +53,13 @@ .spinner.spinner--alignment-horizontal.spinner--size-small .spinner__text { line-height: var(--line-height-size-small); + padding-left: 12px; } .spinner.spinner--alignment-horizontal.spinner--size-large .spinner__text { line-height: var(--line-height-size-large); margin-top: 5px; + padding-left: 12px; } .spinner.spinner--alignment-vertical .spinner__text { @@ -67,23 +67,27 @@ } .spinner.spinner--alignment-vertical.spinner--size-small .spinner__container { - height: 24px; - padding-bottom: 5px; + height: 28px; + width: 28px; + padding-bottom: 4px; } .spinner.spinner--alignment-vertical.spinner--size-large .spinner__container { - height: 48px; - padding-bottom: 5px; + height: 56px; + width: 56px; + padding-bottom: 4px; } .spinner.spinner--alignment-horizontal.spinner--size-small .spinner__container { - height: 24px; - padding-right: 30px; + height: 28px; + width: 28px; + text-align: left; } .spinner.spinner--alignment-horizontal.spinner--size-large .spinner__container { - height: 48px; - padding-right: 60px; + height: 56px; + width: 56px; + text-align: left; } .spinner .spinner__container .spinner__circle { @@ -101,35 +105,11 @@ height: var(--size-outer-small); } -.spinner.spinner.spinner--alignment-vertical - .spinner__container - .spinner__circle-background { - margin-left: -15px; -} - .spinner.spinner--size-large .spinner__container .spinner__circle-background { width: var(--size-outer-large); height: var(--size-outer-large); } -.spinner.spinner--alignment-vertical.spinner--size-large - .spinner__container - .spinner__circle-background { - margin-left: -30px; -} - -.spinner.spinner.spinner--alignment-vertical - .spinner__container - .spinner__circle { - margin-left: -15px; -} - -.spinner.spinner--alignment-vertical.spinner--size-large - .spinner__container - .spinner__circle { - margin-left: -30px; -} - .spinner.spinner--size-large .spinner__container .spinner__circle { width: var(--size-inner-large); height: var(--size-inner-large); diff --git a/packages/components/src/components/loading-spinner/loading-spinner.tsx b/packages/components/src/components/loading-spinner/loading-spinner.tsx index c1e062bc4a..a6d803de21 100644 --- a/packages/components/src/components/loading-spinner/loading-spinner.tsx +++ b/packages/components/src/components/loading-spinner/loading-spinner.tsx @@ -51,9 +51,13 @@ export class LoadingSpinner {
{this.text || 'Loading'}
- + {this.text ? ( + + ) : ( +
+ )} );