Skip to content

Commit

Permalink
Merge branch 'rc'
Browse files Browse the repository at this point in the history
  • Loading branch information
bramkragten committed Dec 12, 2024
2 parents f9844e8 + f8dfdcb commit 9364ea0
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 35 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ jobs:
name: Release landing-page frontend
if: github.event.release.prerelease == false
runs-on: ubuntu-latest
permissions:
contents: write # Required to upload release assets
steps:
- name: Checkout the repository
uses: actions/[email protected]
Expand Down Expand Up @@ -113,6 +115,8 @@ jobs:
name: Release supervisor frontend
if: github.event.release.prerelease == false
runs-on: ubuntu-latest
permissions:
contents: write # Required to upload release assets
steps:
- name: Checkout the repository
uses: actions/[email protected]
Expand Down
2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

[project]
name = "home-assistant-frontend"
version = "20241127.7"
version = "20241127.8"
license = {text = "Apache-2.0"}
description = "The Home Assistant frontend"
readme = "README.md"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,10 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
}, 600);
setTimeout(() => {
this._showThird = true;
}, 3000);
}, 2000);
setTimeout(() => {
this._showFourth = true;
}, 8000);
}, 3000);
}

protected override render() {
Expand Down Expand Up @@ -123,7 +123,7 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
</div>
${this._showThird
? html`<div class="timing user">
3
2
${this.hass.localize(
"ui.panel.config.voice_assistants.satellite_wizard.pipeline.seconds"
)}
Expand All @@ -136,7 +136,7 @@ export class HaVoiceAssistantSetupStepPipeline extends LitElement {
: nothing}
${this._showFourth
? html`<div class="timing hass">
5
1
${this.hass.localize(
"ui.panel.config.voice_assistants.satellite_wizard.pipeline.seconds"
)}
Expand Down
63 changes: 34 additions & 29 deletions src/panels/config/integrations/ha-config-integration-page.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,34 +339,6 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
${this._manifest?.version != null
? html`<div class="version">${this._manifest.version}</div>`
: nothing}
${this._manifest?.quality_scale &&
Object.keys(QUALITY_SCALE_MAP).includes(
this._manifest.quality_scale
)
? html`
<div class="quality-scale integration-info">
<ha-svg-icon
class=${`${this._manifest.quality_scale}-quality`}
.path=${QUALITY_SCALE_MAP[
this._manifest.quality_scale
].icon}
></ha-svg-icon>
<a
href=${documentationUrl(
this.hass,
`/docs/quality_scale/#-${this._manifest.quality_scale}`
)}
rel="noopener noreferrer"
target="_blank"
>
${this.hass.localize(
QUALITY_SCALE_MAP[this._manifest.quality_scale]
.translationKey
)}
</a>
</div>
`
: nothing}
${this._manifest?.is_built_in === false
? html`<div
class=${`integration-info ${
Expand Down Expand Up @@ -414,6 +386,39 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
</div>
<div class="card-actions">
${this._manifest?.quality_scale &&
Object.keys(QUALITY_SCALE_MAP).includes(
this._manifest.quality_scale
)
? html`
<a
href=${documentationUrl(
this.hass,
`/docs/quality_scale/#-${this._manifest.quality_scale}`
)}
rel="noopener noreferrer"
target="_blank"
>
<ha-list-item hasMeta graphic="icon">
<ha-svg-icon
slot="graphic"
class=${`quality-scale ${this._manifest.quality_scale}-quality`}
.path=${QUALITY_SCALE_MAP[
this._manifest.quality_scale
].icon}
></ha-svg-icon>
${this.hass.localize(
QUALITY_SCALE_MAP[this._manifest.quality_scale]
.translationKey
)}
<ha-svg-icon
slot="meta"
.path=${mdiOpenInNew}
></ha-svg-icon>
</ha-list-item>
</a>
`
: nothing}
${devices.length > 0
? html`<a
href=${devices.length === 1
Expand Down Expand Up @@ -1538,7 +1543,7 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) {
.integration-info.info ha-svg-icon {
color: var(--info-color);
}
.quality-scale ha-svg-icon {
.quality-scale {
mask: linear-gradient(-60deg, #000 30%, #0005, #000 70%) right/350%
100%;
animation: shimmer 2.5s infinite;
Expand Down
6 changes: 5 additions & 1 deletion src/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -2871,7 +2871,11 @@
"cloud": {
"description": "Ideal if you don't have a powerful system at home."
},
"local": { "title": "", "description": "", "setup": "" }
"local": {
"title": "Do-it-yourself",
"description": "Install add-ons or containers to run it on your own system. Powerful hardware is needed for fast responses.",
"setup": "Set up"
}
},
"cloud": {
"title": "The power of Home Assistant Cloud",
Expand Down

0 comments on commit 9364ea0

Please sign in to comment.