diff --git a/ts_web/00_commitinfo_data.ts b/ts_web/00_commitinfo_data.ts index ddb4095..80495b0 100644 --- a/ts_web/00_commitinfo_data.ts +++ b/ts_web/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@designestate/dees-catalog', - version: '1.0.138', + version: '1.0.139', description: 'website for lossless.com' } diff --git a/ts_web/elements/dees-button.ts b/ts_web/elements/dees-button.ts index 6cd6f7a..bdd64e8 100644 --- a/ts_web/elements/dees-button.ts +++ b/ts_web/elements/dees-button.ts @@ -181,7 +181,7 @@ export class DeesButton extends DeesElement { @click="${this.dispatchClick}" > ${this.status === 'normal' ? html``: html` - + `}
${this.text ? this.text : this.textContent}
diff --git a/ts_web/elements/dees-icon.ts b/ts_web/elements/dees-icon.ts index 72e8ed9..ca64378 100644 --- a/ts_web/elements/dees-icon.ts +++ b/ts_web/elements/dees-icon.ts @@ -23,6 +23,8 @@ import { import { faCopy as faCopyRegular, + faCircleCheck as faCircleCheckRegular, + faCircleXmark as faCircleXmarkRegular, faMessage as faMessageRegular, faPaste as faPasteRegular, faSun as faSunRegular, @@ -37,6 +39,8 @@ import { faCaretRight as faCaretRightSolid, faCheck as faCheckSolid, faCircleInfo as faCircleInfoSolid, + faCircleCheck as faCircleCheckSolid, + faCircleXmark as faCircleXmarkSolid, faCopy as faCopySolid, faDesktop as faDesktopSolid, faGrip as faGripSolid, @@ -68,8 +72,12 @@ export const faIcons = { caretRightSolid: faCaretRightSolid, check: faCheckSolid, checkSolid: faCheckSolid, - circleinfo: faCircleInfoSolid, - circleinfoSolid: faCircleInfoSolid, + circleInfo: faCircleInfoSolid, + circleInfoSolid: faCircleInfoSolid, + circleCheck: faCircleCheckRegular, + circleCheckSolid: faCircleCheckSolid, + circleXmark: faCircleXmarkRegular, + circleXmarkSolid: faCircleXmarkSolid, copy: faCopyRegular, copySolid: faCopySolid, desktop: faDesktopSolid, diff --git a/ts_web/elements/dees-spinner.ts b/ts_web/elements/dees-spinner.ts index 43ae0fa..bcc34b2 100644 --- a/ts_web/elements/dees-spinner.ts +++ b/ts_web/elements/dees-spinner.ts @@ -32,6 +32,11 @@ export class DeesSpinner extends DeesElement { }) public size = 20; + @property({ + type: String, + }) + public bnw: boolean = false; + @property() public status: 'normal' | 'pending' | 'success' | 'error' = 'normal'; @@ -61,12 +66,14 @@ export class DeesSpinner extends DeesElement { } #loading.success { + border: none; border-radius: 50%; animation: none; -webkit-animation: none; } #loading.error { + border: none; border-radius: 50%; animation: none; -webkit-animation: none; @@ -88,14 +95,6 @@ export class DeesSpinner extends DeesElement { height: 100%; width: 100%; } - - #loading.success dees-icon { - color: #8bc34a; - } - - #loading.error dees-icon { - color: #e64a19; - } `, ]; @@ -107,21 +106,22 @@ export class DeesSpinner extends DeesElement { height: ${this.size}px; } #loading.success { - border: ${Math.round(this.size * 0.08)}px solid ${cssManager.bdTheme(`#8bc34a`, '#8bc34a')} + color: ${cssManager.bdTheme(this.bnw ? '#333': `#8bc34a`, this.bnw ? '#fff' : `#8bc34a`)}; + } #loading.error { - border: ${Math.round(this.size * 0.1)}px solid ${cssManager.bdTheme(`#e64a19`, '#e64a19')} + color: ${cssManager.bdTheme(this.bnw ? '#333': `#e64a19`, this.bnw ? '#fff' : `#e64a19`)}; } dees-icon { - font-size: ${Math.round(this.size * 0.6)}px; + font-size: ${this.size}px; }
${(() => { if (this.status === 'success') { - return html``; + return html``; } else if (this.status === 'error') { - return html``; + return html``; } })()}