Merge pull request #6399 from home-assistant/dev

This commit is contained in:
Bram Kragten 2020-07-15 20:19:11 +02:00 committed by GitHub
commit 2e198af8c3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 8 deletions

View File

@ -2,7 +2,7 @@ from setuptools import setup, find_packages
setup( setup(
name="home-assistant-frontend", name="home-assistant-frontend",
version="20200715.0", version="20200715.1",
description="The Home Assistant frontend", description="The Home Assistant frontend",
url="https://github.com/home-assistant/home-assistant-polymer", url="https://github.com/home-assistant/home-assistant-polymer",
author="The Home Assistant Authors", author="The Home Assistant Authors",

View File

@ -19,7 +19,13 @@ export const iconColorCSS = css`
ha-icon[data-domain="sun"][data-state="above_horizon"], ha-icon[data-domain="sun"][data-state="above_horizon"],
ha-icon[data-domain="switch"][data-state="on"], ha-icon[data-domain="switch"][data-state="on"],
ha-icon[data-domain="timer"][data-state="active"], ha-icon[data-domain="timer"][data-state="active"],
ha-icon[data-domain="vacuum"][data-state="cleaning"] { ha-icon[data-domain="vacuum"][data-state="cleaning"],
ha-icon[data-domain="group"][data-state="on"],
ha-icon[data-domain="group"][data-state="home"],
ha-icon[data-domain="group"][data-state="open"],
ha-icon[data-domain="group"][data-state="locked"],
ha-icon[data-domain="group"][data-state="problem"]
{
color: var(--paper-item-icon-active-color, #fdd835); color: var(--paper-item-icon-active-color, #fdd835);
} }

View File

@ -47,7 +47,7 @@ import { HaDeviceTrigger } from "./trigger/types/ha-automation-trigger-device";
import { mdiContentSave } from "@mdi/js"; import { mdiContentSave } from "@mdi/js";
import { PaperListboxElement } from "@polymer/paper-listbox"; import { PaperListboxElement } from "@polymer/paper-listbox";
const MODES = ["parallel", "single", "restart", "queued"]; const MODES = ["single", "restart", "queued", "parallel"];
const MODES_MAX = ["queued", "parallel"]; const MODES_MAX = ["queued", "parallel"];
export class HaAutomationEditor extends LitElement { export class HaAutomationEditor extends LitElement {

View File

@ -45,9 +45,13 @@ class CloudForgotPassword extends LocalizeMixin(EventsMixin(PolymerElement)) {
display: none; display: none;
} }
</style> </style>
<hass-subpage header=[[localize('ui.panel.config.cloud.forgot_password.title')]]> <hass-subpage
header="[[localize('ui.panel.config.cloud.forgot_password.title')]]"
>
<div class="content"> <div class="content">
<ha-card header=[[localize('ui.panel.config.cloud.forgot_password.subtitle')]]> <ha-card
header="[[localize('ui.panel.config.cloud.forgot_password.subtitle')]]"
>
<div class="card-content"> <div class="card-content">
<p> <p>
[[localize('ui.panel.config.cloud.forgot_password.instructions')]] [[localize('ui.panel.config.cloud.forgot_password.instructions')]]

View File

@ -191,7 +191,7 @@ class HuiAlarmPanelCard extends LitElement implements LovelaceCard {
: html` : html`
<paper-input <paper-input
id="alarmCode" id="alarmCode"
label="Alarm Code" .label=${this.hass.localize('ui.card.alarm_control_panel.code')}
type="password" type="password"
></paper-input> ></paper-input>
`} `}

View File

@ -847,10 +847,10 @@
"label": "Mode", "label": "Mode",
"description": "The mode controls what happens when the automation is triggered while the actions are still running from a previous trigger. Check the {documentation_link} for more info.", "description": "The mode controls what happens when the automation is triggered while the actions are still running from a previous trigger. Check the {documentation_link} for more info.",
"documentation": "automation documentation", "documentation": "automation documentation",
"single": "Single", "single": "Single (default)",
"restart": "Restart", "restart": "Restart",
"queued": "Queued", "queued": "Queued",
"parallel": "Parallel (default)" "parallel": "Parallel"
}, },
"max": { "max": {
"queued": "Queue length", "queued": "Queue length",