From e8996063dd99b60d48bb374877182764ea5566e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Lov=C3=A9n?= Date: Mon, 29 Jun 2020 10:51:28 +0200 Subject: [PATCH] Remove google colors. Fix #6254 (#6263) --- demo/src/configs/jimpower/theme.ts | 4 ++-- demo/src/configs/kernehed/theme.ts | 4 ++-- hassio/src/addon-view/config/hassio-addon-audio.ts | 2 +- hassio/src/addon-view/config/hassio-addon-config.ts | 4 ++-- hassio/src/addon-view/config/hassio-addon-network.ts | 2 +- hassio/src/addon-view/info/hassio-addon-info.ts | 8 ++++---- hassio/src/addon-view/log/hassio-addon-logs.ts | 2 +- hassio/src/components/hassio-card-content.ts | 2 +- hassio/src/dashboard/hassio-update.ts | 2 +- .../src/dialogs/snapshot/dialog-hassio-snapshot.ts | 2 +- hassio/src/system/hassio-host-info.ts | 4 ++-- hassio/src/system/hassio-supervisor-info.ts | 2 +- hassio/src/system/hassio-supervisor-log.ts | 2 +- src/components/buttons/ha-progress-button.js | 4 ++-- src/components/ha-climate-control.js | 2 +- src/components/ha-water_heater-control.js | 2 +- .../dialog-config-entry-system-options.ts | 2 +- .../dialog-device-registry-detail.ts | 2 +- .../controls/more-info-alarm_control_panel.js | 2 +- src/dialogs/more-info/more-info-controls.js | 2 +- .../voice-command-dialog/ha-voice-command-dialog.ts | 2 +- .../config/areas/dialog-area-registry-detail.ts | 2 +- src/panels/config/automation/ha-automation-editor.ts | 2 +- .../config/automation/thingtalk/dialog-thingtalk.ts | 2 +- .../thingtalk/ha-thingtalk-placeholders.ts | 2 +- .../cloud/forgot-password/cloud-forgot-password.js | 2 +- src/panels/config/cloud/login/cloud-login.js | 2 +- src/panels/config/cloud/register/cloud-register.js | 2 +- src/panels/config/core/ha-config-section-core.js | 4 ++-- src/panels/config/entities/dialog-entity-editor.ts | 2 +- .../settings/entity-settings-helper-tab.ts | 4 ++-- src/panels/config/entities/ha-config-entities.ts | 2 +- .../integration-panels/zha/zha-add-devices-page.ts | 2 +- .../integration-panels/zha/zha-add-group-page.ts | 2 +- .../integration-panels/zha/zha-cluster-attributes.ts | 2 +- .../integration-panels/zha/zha-cluster-commands.ts | 2 +- .../integration-panels/zha/zha-device-binding.ts | 2 +- .../integration-panels/zha/zha-group-binding.ts | 2 +- .../integration-panels/zha/zha-group-page.ts | 2 +- .../integration-panels/zwave/zwave-network.ts | 2 +- .../zwave/zwave-node-protection.js | 2 +- src/panels/config/scene/ha-scene-editor.ts | 2 +- src/panels/config/script/ha-script-editor.ts | 2 +- .../server_control/ha-config-server-control.ts | 4 ++-- .../service/developer-tools-service.js | 2 +- src/panels/lovelace/cards/hui-alarm-panel-card.ts | 2 +- src/panels/lovelace/cards/hui-plant-status-card.ts | 2 +- .../config-elements/hui-shopping-list-editor.ts | 2 +- src/panels/lovelace/hui-root.ts | 2 +- src/resources/ha-style.ts | 3 +++ src/resources/styles.ts | 12 ++++++------ 51 files changed, 69 insertions(+), 66 deletions(-) diff --git a/demo/src/configs/jimpower/theme.ts b/demo/src/configs/jimpower/theme.ts index 5d269d38a9..7e304eb6c6 100644 --- a/demo/src/configs/jimpower/theme.ts +++ b/demo/src/configs/jimpower/theme.ts @@ -26,9 +26,9 @@ export const demoThemeJimpower = () => ({ "switch-checked-color": "var(--accent-color)", "paper-dialog-background-color": "#434954", "secondary-text-color": "#5294E2", - "google-red-500": "#E45E65", + "error-color": "#E45E65", "divider-color": "rgba(0, 0, 0, .12)", - "google-green-500": "#39E949", + "success-color": "#39E949", "switch-unchecked-button-color": "var(--disabled-text-color)", "label-badge-border-color": "green", "paper-listbox-color": "var(--primary-color)", diff --git a/demo/src/configs/kernehed/theme.ts b/demo/src/configs/kernehed/theme.ts index e1cb10e78a..ffb2f0edfe 100644 --- a/demo/src/configs/kernehed/theme.ts +++ b/demo/src/configs/kernehed/theme.ts @@ -27,9 +27,9 @@ export const demoThemeKernehed = () => ({ "switch-checked-color": "var(--accent-color)", "paper-dialog-background-color": "#292929", "secondary-text-color": "#b58e31", - "google-red-500": "#b58e31", + "error-color": "#b58e31", "divider-color": "rgba(0, 0, 0, .12)", - "google-green-500": "#2980b9", + "success-color": "#2980b9", "switch-unchecked-button-color": "var(--disabled-text-color)", "label-badge-border-color": "green", "paper-listbox-color": "#777777", diff --git a/hassio/src/addon-view/config/hassio-addon-audio.ts b/hassio/src/addon-view/config/hassio-addon-audio.ts index 233adc63cc..8a7b4c08c5 100644 --- a/hassio/src/addon-view/config/hassio-addon-audio.ts +++ b/hassio/src/addon-view/config/hassio-addon-audio.ts @@ -107,7 +107,7 @@ class HassioAddonAudio extends LitElement { display: block; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-bottom: 16px; } paper-item { diff --git a/hassio/src/addon-view/config/hassio-addon-config.ts b/hassio/src/addon-view/config/hassio-addon-config.ts index 1297981cbf..56eec34d95 100644 --- a/hassio/src/addon-view/config/hassio-addon-config.ts +++ b/hassio/src/addon-view/config/hassio-addon-config.ts @@ -84,7 +84,7 @@ class HassioAddonConfig extends LitElement { justify-content: space-between; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-top: 16px; } iron-autogrow-textarea { @@ -92,7 +92,7 @@ class HassioAddonConfig extends LitElement { font-family: monospace; } .syntaxerror { - color: var(--google-red-500); + color: var(--error-color); } `, ]; diff --git a/hassio/src/addon-view/config/hassio-addon-network.ts b/hassio/src/addon-view/config/hassio-addon-network.ts index f834ecbe25..e199a0bcc1 100644 --- a/hassio/src/addon-view/config/hassio-addon-network.ts +++ b/hassio/src/addon-view/config/hassio-addon-network.ts @@ -105,7 +105,7 @@ class HassioAddonNetwork extends LitElement { display: block; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-bottom: 16px; } .card-actions { diff --git a/hassio/src/addon-view/info/hassio-addon-info.ts b/hassio/src/addon-view/info/hassio-addon-info.ts index 7ba518c194..22a708d38e 100644 --- a/hassio/src/addon-view/info/hassio-addon-info.ts +++ b/hassio/src/addon-view/info/hassio-addon-info.ts @@ -560,7 +560,7 @@ class HassioAddonInfo extends LitElement { margin-bottom: 16px; } ha-card.warning { - background-color: var(--google-red-500); + background-color: var(--error-color); color: white; } ha-card.warning .card-header { @@ -573,8 +573,8 @@ class HassioAddonInfo extends LitElement { --mdc-theme-primary: white !important; } .warning { - color: var(--google-red-500); - --mdc-theme-primary: var(--google-red-500); + color: var(--error-color); + --mdc-theme-primary: var(--error-color); } .light-color { color: var(--secondary-text-color); @@ -590,7 +590,7 @@ class HassioAddonInfo extends LitElement { vertical-align: middle; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-bottom: 16px; } .description { diff --git a/hassio/src/addon-view/log/hassio-addon-logs.ts b/hassio/src/addon-view/log/hassio-addon-logs.ts index 4613ff2a61..069b5f6c7a 100644 --- a/hassio/src/addon-view/log/hassio-addon-logs.ts +++ b/hassio/src/addon-view/log/hassio-addon-logs.ts @@ -62,7 +62,7 @@ class HassioAddonLogs extends LitElement { display: block; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-bottom: 16px; } `, diff --git a/hassio/src/components/hassio-card-content.ts b/hassio/src/components/hassio-card-content.ts index 71f55c42e4..015e131bd2 100644 --- a/hassio/src/components/hassio-card-content.ts +++ b/hassio/src/components/hassio-card-content.ts @@ -98,7 +98,7 @@ class HassioCardContent extends LitElement { color: var(--paper-item-icon-color); } ha-svg-icon.not_available { - color: var(--google-red-500); + color: var(--error-color); } .title { color: var(--primary-text-color); diff --git a/hassio/src/dashboard/hassio-update.ts b/hassio/src/dashboard/hassio-update.ts index b3b7e6ad7f..31e97cb8b2 100644 --- a/hassio/src/dashboard/hassio-update.ts +++ b/hassio/src/dashboard/hassio-update.ts @@ -180,7 +180,7 @@ export class HassioUpdate extends LitElement { text-align: right; } .errors { - color: var(--google-red-500); + color: var(--error-color); padding: 16px; } a { diff --git a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts b/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts index a33c4ca226..589878b7aa 100755 --- a/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts +++ b/hassio/src/dialogs/snapshot/dialog-hassio-snapshot.ts @@ -224,7 +224,7 @@ class HassioSnapshotDialog extends LitElement { } .warning, .error { - color: var(--google-red-500); + color: var(--error-color); } .buttons { display: flex; diff --git a/hassio/src/system/hassio-host-info.ts b/hassio/src/system/hassio-host-info.ts index 6413788b88..be0596122c 100644 --- a/hassio/src/system/hassio-host-info.ts +++ b/hassio/src/system/hassio-host-info.ts @@ -146,7 +146,7 @@ class HassioHostInfo extends LitElement { text-align: right; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-top: 16px; } mwc-button.info { @@ -156,7 +156,7 @@ class HassioHostInfo extends LitElement { margin-bottom: 10px; } .warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } `, ]; diff --git a/hassio/src/system/hassio-supervisor-info.ts b/hassio/src/system/hassio-supervisor-info.ts index e7d3166ef7..51a45c18b2 100644 --- a/hassio/src/system/hassio-supervisor-info.ts +++ b/hassio/src/system/hassio-supervisor-info.ts @@ -117,7 +117,7 @@ class HassioSupervisorInfo extends LitElement { text-align: right; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-top: 16px; } `, diff --git a/hassio/src/system/hassio-supervisor-log.ts b/hassio/src/system/hassio-supervisor-log.ts index d2d6ad3da2..af3b94665d 100644 --- a/hassio/src/system/hassio-supervisor-log.ts +++ b/hassio/src/system/hassio-supervisor-log.ts @@ -123,7 +123,7 @@ class HassioSupervisorLog extends LitElement { width: 96%; } .errors { - color: var(--google-red-500); + color: var(--error-color); margin-bottom: 16px; } .card-content { diff --git a/src/components/buttons/ha-progress-button.js b/src/components/buttons/ha-progress-button.js index a00e6209cb..084e50c5a2 100644 --- a/src/components/buttons/ha-progress-button.js +++ b/src/components/buttons/ha-progress-button.js @@ -22,13 +22,13 @@ class HaProgressButton extends PolymerElement { .success mwc-button { --mdc-theme-primary: white; - background-color: var(--google-green-500); + background-color: var(--success-color); transition: none; } .error mwc-button { --mdc-theme-primary: white; - background-color: var(--google-red-500); + background-color: var(--error-color); transition: none; } diff --git a/src/components/ha-climate-control.js b/src/components/ha-climate-control.js index 399f46d7b1..f4732d8623 100644 --- a/src/components/ha-climate-control.js +++ b/src/components/ha-climate-control.js @@ -20,7 +20,7 @@ class HaClimateControl extends EventsMixin(PolymerElement) { @apply --layout-justified; } .in-flux#target_temperature { - color: var(--google-red-500); + color: var(--error-color); } #target_temperature { @apply --layout-self-center; diff --git a/src/components/ha-water_heater-control.js b/src/components/ha-water_heater-control.js index 4a211ed9ab..ace62634d0 100644 --- a/src/components/ha-water_heater-control.js +++ b/src/components/ha-water_heater-control.js @@ -20,7 +20,7 @@ class HaWaterHeaterControl extends EventsMixin(PolymerElement) { @apply --layout-justified; } .in-flux#target_temperature { - color: var(--google-red-500); + color: var(--error-color); } #target_temperature { @apply --layout-self-center; diff --git a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts index b7cbcf4b39..cb2f95a287 100644 --- a/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts +++ b/src/dialogs/config-entry-system-options/dialog-config-entry-system-options.ts @@ -180,7 +180,7 @@ class DialogConfigEntrySystemOptions extends LitElement { } .error { - color: var(--google-red-500); + color: var(--error-color); } `, ]; diff --git a/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts b/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts index 5758c8f3a0..9386b900d9 100644 --- a/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts +++ b/src/dialogs/device-registry-detail/dialog-device-registry-detail.ts @@ -132,7 +132,7 @@ class DialogDeviceRegistryDetail extends LitElement { margin-right: auto; } .error { - color: var(--google-red-500); + color: var(--error-color); } `, ]; diff --git a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js index 016f72e118..2f7f4fd357 100644 --- a/src/dialogs/more-info/controls/more-info-alarm_control_panel.js +++ b/src/dialogs/more-info/controls/more-info-alarm_control_panel.js @@ -34,7 +34,7 @@ class MoreInfoAlarmControlPanel extends LocalizeMixin(PolymerElement) { max-width: 200px; } mwc-button.disarm { - color: var(--google-red-500); + color: var(--error-color); } diff --git a/src/dialogs/more-info/more-info-controls.js b/src/dialogs/more-info/more-info-controls.js index 7eedf536d3..ceae69366a 100644 --- a/src/dialogs/more-info/more-info-controls.js +++ b/src/dialogs/more-info/more-info-controls.js @@ -64,7 +64,7 @@ class MoreInfoControls extends LocalizeMixin(EventsMixin(PolymerElement)) { } mwc-button.warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } :host([domain="camera"]) paper-dialog-scrollable { diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts index 7415c133ac..4b57035a8a 100644 --- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts +++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts @@ -446,7 +446,7 @@ export class HaVoiceCommandDialog extends LitElement { } .message.error { - background-color: var(--google-red-500); + background-color: var(--error-color); color: var(--text-primary-color); } diff --git a/src/panels/config/areas/dialog-area-registry-detail.ts b/src/panels/config/areas/dialog-area-registry-detail.ts index 63a4360c7f..78c5a522df 100644 --- a/src/panels/config/areas/dialog-area-registry-detail.ts +++ b/src/panels/config/areas/dialog-area-registry-detail.ts @@ -157,7 +157,7 @@ class DialogAreaDetail extends LitElement { margin-right: auto; } .error { - color: var(--google-red-500); + color: var(--error-color); } `, ]; diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index 70f60c5e0a..8129605c23 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -445,7 +445,7 @@ export class HaAutomationEditor extends LitElement { .errors { padding: 20px; font-weight: bold; - color: var(--google-red-500); + color: var(--error-color); } .content { padding-bottom: 20px; diff --git a/src/panels/config/automation/thingtalk/dialog-thingtalk.ts b/src/panels/config/automation/thingtalk/dialog-thingtalk.ts index 7f1a73d196..7bf85c3ff8 100644 --- a/src/panels/config/automation/thingtalk/dialog-thingtalk.ts +++ b/src/panels/config/automation/thingtalk/dialog-thingtalk.ts @@ -257,7 +257,7 @@ class DialogThingtalk extends LitElement { display: block; } .error { - color: var(--google-red-500); + color: var(--error-color); } .attribution { color: var(--secondary-text-color); diff --git a/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts b/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts index 2e853c10a2..3a1d1db4ab 100644 --- a/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts +++ b/src/panels/config/automation/thingtalk/ha-thingtalk-placeholders.ts @@ -480,7 +480,7 @@ export class ThingTalkPlaceholders extends SubscribeMixin(LitElement) { font-weight: 500; } .error { - color: var(--google-red-500); + color: var(--error-color); } `, ]; diff --git a/src/panels/config/cloud/forgot-password/cloud-forgot-password.js b/src/panels/config/cloud/forgot-password/cloud-forgot-password.js index 6d82355c14..db67dce724 100644 --- a/src/panels/config/cloud/forgot-password/cloud-forgot-password.js +++ b/src/panels/config/cloud/forgot-password/cloud-forgot-password.js @@ -32,7 +32,7 @@ class CloudForgotPassword extends LocalizeMixin(EventsMixin(PolymerElement)) { margin: 0; } .error { - color: var(--google-red-500); + color: var(--error-color); } .card-actions { display: flex; diff --git a/src/panels/config/cloud/login/cloud-login.js b/src/panels/config/cloud/login/cloud-login.js index f8d27ffcd0..c251be6ffe 100644 --- a/src/panels/config/cloud/login/cloud-login.js +++ b/src/panels/config/cloud/login/cloud-login.js @@ -52,7 +52,7 @@ class CloudLogin extends LocalizeMixin( margin: 0; } .error { - color: var(--google-red-500); + color: var(--error-color); } .card-actions { display: flex; diff --git a/src/panels/config/cloud/register/cloud-register.js b/src/panels/config/cloud/register/cloud-register.js index 9373b10a16..7a3fab226a 100644 --- a/src/panels/config/cloud/register/cloud-register.js +++ b/src/panels/config/cloud/register/cloud-register.js @@ -39,7 +39,7 @@ class CloudRegister extends LocalizeMixin(EventsMixin(PolymerElement)) { margin: 0; } .error { - color: var(--google-red-500); + color: var(--error-color); } .card-actions { display: flex; diff --git a/src/panels/config/core/ha-config-section-core.js b/src/panels/config/core/ha-config-section-core.js index b73161c709..3dc768f19d 100644 --- a/src/panels/config/core/ha-config-section-core.js +++ b/src/panels/config/core/ha-config-section-core.js @@ -27,7 +27,7 @@ class HaConfigSectionCore extends LocalizeMixin(PolymerElement) { } .validate-result { - color: var(--google-green-500); + color: var(--success-color); font-weight: 500; margin-bottom: 1em; } @@ -37,7 +37,7 @@ class HaConfigSectionCore extends LocalizeMixin(PolymerElement) { } .config-invalid .text { - color: var(--google-red-500); + color: var(--error-color); font-weight: 500; } diff --git a/src/panels/config/entities/dialog-entity-editor.ts b/src/panels/config/entities/dialog-entity-editor.ts index f4f6d43076..3aecc2b883 100644 --- a/src/panels/config/entities/dialog-entity-editor.ts +++ b/src/panels/config/entities/dialog-entity-editor.ts @@ -292,7 +292,7 @@ export class DialogEntityEditor extends LitElement { } mwc-button.warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } :host([rtl]) app-toolbar { diff --git a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts index 24ef2e3046..e6aa99aa2f 100644 --- a/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts +++ b/src/panels/config/entities/editor-tabs/settings/entity-settings-helper-tab.ts @@ -241,10 +241,10 @@ export class EntityRegistrySettingsHelper extends LitElement { margin-bottom: -20px; } mwc-button.warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } .error { - color: var(--google-red-500); + color: var(--error-color); } .row { margin-top: 8px; diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index 09766612bd..e43f2ab103 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -180,7 +180,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { > .card-actions.warning ha-call-api-button { - color: var(--google-red-500); + color: var(--error-color); } .content { margin-top: 24px; diff --git a/src/panels/config/scene/ha-scene-editor.ts b/src/panels/config/scene/ha-scene-editor.ts index 9675e630fb..961d51672d 100644 --- a/src/panels/config/scene/ha-scene-editor.ts +++ b/src/panels/config/scene/ha-scene-editor.ts @@ -683,7 +683,7 @@ export class HaSceneEditor extends SubscribeMixin(LitElement) { .errors { padding: 20px; font-weight: bold; - color: var(--google-red-500); + color: var(--error-color); } .content { padding-bottom: 20px; diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts index d01215a8f9..85c35f7415 100644 --- a/src/panels/config/script/ha-script-editor.ts +++ b/src/panels/config/script/ha-script-editor.ts @@ -295,7 +295,7 @@ export class HaScriptEditor extends LitElement { .errors { padding: 20px; font-weight: bold; - color: var(--google-red-500); + color: var(--error-color); } .content { padding-bottom: 20px; diff --git a/src/panels/config/server_control/ha-config-server-control.ts b/src/panels/config/server_control/ha-config-server-control.ts index 8d05bc2113..7a06a6a439 100644 --- a/src/panels/config/server_control/ha-config-server-control.ts +++ b/src/panels/config/server_control/ha-config-server-control.ts @@ -245,7 +245,7 @@ export class HaConfigServerControl extends LitElement { } .validate-result { - color: var(--google-green-500); + color: var(--success-color); font-weight: 500; margin-bottom: 1em; } @@ -255,7 +255,7 @@ export class HaConfigServerControl extends LitElement { } .config-invalid .text { - color: var(--google-red-500); + color: var(--error-color); font-weight: 500; } diff --git a/src/panels/developer-tools/service/developer-tools-service.js b/src/panels/developer-tools/service/developer-tools-service.js index 528022b263..f1e996f4f1 100644 --- a/src/panels/developer-tools/service/developer-tools-service.js +++ b/src/panels/developer-tools/service/developer-tools-service.js @@ -81,7 +81,7 @@ class HaPanelDevService extends LocalizeMixin(PolymerElement) { } .error { - color: var(--google-red-500); + color: var(--error-color); } diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts index a0d70704d8..bcb4343481 100644 --- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts +++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts @@ -362,7 +362,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard { } mwc-button#disarm { - color: var(--google-red-500); + color: var(--error-color); } `; } diff --git a/src/panels/lovelace/cards/hui-plant-status-card.ts b/src/panels/lovelace/cards/hui-plant-status-card.ts index 304e0f65ec..95ea0a6209 100644 --- a/src/panels/lovelace/cards/hui-plant-status-card.ts +++ b/src/panels/lovelace/cards/hui-plant-status-card.ts @@ -229,7 +229,7 @@ class HuiPlantStatusCard extends LitElement implements LovelaceCard { } .problem { - color: var(--google-red-500); + color: var(--error-color); font-weight: bold; } diff --git a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts index 98fea1a69b..830b47182c 100644 --- a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts @@ -104,7 +104,7 @@ export class HuiShoppingListEditor extends LitElement static get styles(): CSSResult { return css` .error { - color: var(--google-red-500); + color: var(--error-color); } `; } diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts index 95843c2642..d75862cb4a 100644 --- a/src/panels/lovelace/hui-root.ts +++ b/src/panels/lovelace/hui-root.ts @@ -698,7 +698,7 @@ class HUIRoot extends LitElement { color: var(--text-primary-color, white); } mwc-button.warning:not([disabled]) { - color: var(--google-red-500); + color: var(--error-color); } #view { min-height: calc(100vh - 112px); diff --git a/src/resources/ha-style.ts b/src/resources/ha-style.ts index a3f2b7d780..b1a63138c3 100644 --- a/src/resources/ha-style.ts +++ b/src/resources/ha-style.ts @@ -34,6 +34,9 @@ documentContainer.innerHTML = ` --scrollbar-thumb-color: rgb(194, 194, 194); --error-color: #db4437; + --warning-color: f4b400; + --success-color: #0f9d58; + --info-color: #4285f4; /* states and badges */ --state-icon-color: #44739e; diff --git a/src/resources/styles.ts b/src/resources/styles.ts index 1241208cab..53d84dfc49 100644 --- a/src/resources/styles.ts +++ b/src/resources/styles.ts @@ -105,15 +105,15 @@ export const haStyle = css` } .error { - color: var(--google-red-500); + color: var(--error-color); } .warning { - color: var(--google-red-500); + color: var(--error-color); } mwc-button.warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } button.link { @@ -132,7 +132,7 @@ export const haStyle = css` } .card-actions .warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } .layout.horizontal, @@ -247,9 +247,9 @@ export const haStyleDialog = css` } } mwc-button.warning { - --mdc-theme-primary: var(--google-red-500); + --mdc-theme-primary: var(--error-color); } .error { - color: var(--google-red-500); + color: var(--error-color); } `;