diff --git a/src/components/calcite-action/calcite-action.scss b/src/components/calcite-action/calcite-action.scss index 5d252d4b..72211313 100755 --- a/src/components/calcite-action/calcite-action.scss +++ b/src/components/calcite-action/calcite-action.scss @@ -1,5 +1,6 @@ :host { display: block; + background-color: var(--calcite-app-background-clear); } .button { @@ -74,6 +75,16 @@ background-color: var(--calcite-app-background-active); } +:host([loading]) .button, +:host([loading]) .button:hover { + background-color: var(--calcite-app-background); +} + +:host([loading]) calcite-loader[inline] { + color: var(--calcite-app-foreground-subtle); + margin-right: 0; +} + :host([disabled]) .button, :host([disabled]) .button:hover { cursor: default; diff --git a/src/components/calcite-action/calcite-action.tsx b/src/components/calcite-action/calcite-action.tsx index 8f29006b..b0b9fae8 100755 --- a/src/components/calcite-action/calcite-action.tsx +++ b/src/components/calcite-action/calcite-action.tsx @@ -90,10 +90,12 @@ export class CalciteAction { const iconContainerNode = ( ); + // const loaderNode = this.loading ? () : null; + const calculatedTextDisplay = textEnabled ? "visible" : textDisplay; const textContainerNode = diff --git a/src/demos/calcite-action.html b/src/demos/calcite-action.html index 506f13d7..fffb5daa 100644 --- a/src/demos/calcite-action.html +++ b/src/demos/calcite-action.html @@ -25,85 +25,15 @@

calcite-action

LTR

-

With text

- - - - - - - - - - - - -

Without text

- - - - - - -

Auto text

- - - - - - -

Disabled with text

- - - - - - -

Disabled without text

- - - - - - -

RTL

- -
+

With text

- With text + + + + + +

Without text

Auto text /> + +

Disabled with text

+ + + + + + +

Disabled without text

+ + + + + + +

Loading with text

+ + + + + + +

Loading without text

+ + + + + + +

RTL

+ +
+

With text

+ + + + + + +

Without text

+ + + + + + +

Auto text

+ + + + + +