From d86b2eef7449e68b307a1f3761c447c39f2e446b Mon Sep 17 00:00:00 2001 From: Patrizio Bekerle <patrizio.bekerle@tugraz.at> Date: Thu, 10 Oct 2019 10:55:01 +0200 Subject: [PATCH] Fix styling --- packages/common/vpu-button.js | 18 ++---------------- packages/common/vpu-common-demo.js | 2 +- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/packages/common/vpu-button.js b/packages/common/vpu-button.js index af196ed8..dac995e9 100644 --- a/packages/common/vpu-button.js +++ b/packages/common/vpu-button.js @@ -73,26 +73,12 @@ class Button extends VPULitElement { // language=css return css` ${commonUtils.getThemeCSS()} - .button { - cursor: pointer; - justify-content: center; - padding-bottom: calc(.375rem - 1px); - padding-left: .75rem; - padding-right: .75rem; - padding-top: calc(.375rem - 1px); - text-align: center; - white-space: nowrap; - }`; + ${commonUtils.getButtonCSS()} + `; } render() { return html` - <style> - .primary { - background: var(--vpu-primary-bg-color); - color: var(--vpu-primary-text-color); - } - </style> <button @click="${this.clickHandler}" class="button ${this.type}" ?disabled="${this.disabled}"> ${this.value} <vpu-mini-spinner style="display: ${this.spinner ? "inline" : "none"}"></vpu-mini-spinner> </button> diff --git a/packages/common/vpu-common-demo.js b/packages/common/vpu-common-demo.js index e4dda27c..9d192a6e 100644 --- a/packages/common/vpu-common-demo.js +++ b/packages/common/vpu-common-demo.js @@ -125,7 +125,7 @@ class VpuCommonDemo extends VPULitElement { <div class="content"> <h2>Button</h2> <div class="control"> - <vpu-button value="Load" @click="${this.buttonClickHandler}" type="primary"></vpu-button> + <vpu-button value="Load" @click="${this.buttonClickHandler}" type="is-primary"></vpu-button> </div> </div> <div class="content"> -- GitLab