Skip to content

Commit 9e65409

Browse files
authored
Merge branch 'dev' into energy-pie
2 parents 1d45c6c + be63ff7 commit 9e65409

File tree

380 files changed

+7144
-3458
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

380 files changed

+7144
-3458
lines changed

.github/workflows/codeql-analysis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ jobs:
3636

3737
# Initializes the CodeQL tools for scanning.
3838
- name: Initialize CodeQL
39-
uses: github/codeql-action/init@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
39+
uses: github/codeql-action/init@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4040
with:
4141
languages: ${{ matrix.language }}
4242

4343
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
4444
# If this step fails, then you should remove it and run the build manually (see below)
4545
- name: Autobuild
46-
uses: github/codeql-action/autobuild@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
46+
uses: github/codeql-action/autobuild@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8
4747

4848
# ℹ️ Command-line programs to run using the OS shell.
4949
# 📚 https://git.io/JvXDl
@@ -57,4 +57,4 @@ jobs:
5757
# make release
5858

5959
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@3599b3baa15b485a2e49ef411a7a4bb2452e7f93 # v3.30.5
60+
uses: github/codeql-action/analyze@f443b600d91635bebf5b0d9ebc620189c0d6fba5 # v4.30.8

.github/workflows/release.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
script/release
5656
5757
- name: Upload release assets
58-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
58+
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
5959
with:
6060
files: |
6161
dist/*.whl
@@ -108,7 +108,7 @@ jobs:
108108
- name: Tar folder
109109
run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist .
110110
- name: Upload release asset
111-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
111+
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
112112
with:
113113
files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz
114114

@@ -137,6 +137,6 @@ jobs:
137137
- name: Tar folder
138138
run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build .
139139
- name: Upload release asset
140-
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
140+
uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
141141
with:
142142
files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz

.github/workflows/stale.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
steps:
1212
- name: 90 days stale policy
13-
uses: actions/stale@3a9db7e6a41a89f618792c92c0e97cc736e1b13f # v10.0.0
13+
uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
1414
with:
1515
repo-token: ${{ secrets.GITHUB_TOKEN }}
1616
days-before-stale: 90

build-scripts/bundle.cjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,6 @@ module.exports.babelOptions = ({
183183
include: /\/node_modules\//,
184184
exclude: [
185185
"element-internals-polyfill",
186-
"@shoelace-style",
187186
"@?lit(?:-labs|-element|-html)?",
188187
].map((p) => new RegExp(`/node_modules/${p}/`)),
189188
},

cast/src/launcher/layout/hc-cast.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ class HcCast extends LitElement {
242242
}
243243
244244
.question:before {
245-
border-radius: 4px;
245+
border-radius: var(--ha-border-radius-sm);
246246
position: absolute;
247247
top: 0;
248248
right: 0;

cast/src/launcher/layout/hc-layout.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ class HcLayout extends LitElement {
9595
}
9696
9797
.hero {
98-
border-radius: 4px 4px 0 0;
98+
border-radius: var(--ha-border-radius-sm) var(--ha-border-radius-sm)
99+
var(--ha-border-radius-square) var(--ha-border-radius-square);
99100
}
100101
.subtitle {
101102
font-size: var(--ha-font-size-m);

gallery/src/ha-gallery.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ class HaGallery extends LitElement {
208208
}
209209
210210
.sidebar a[active]::before {
211-
border-radius: 12px;
211+
border-radius: var(--ha-border-radius-lg);
212212
position: absolute;
213213
top: 0;
214214
right: 2px;
@@ -241,7 +241,7 @@ class HaGallery extends LitElement {
241241
text-align: center;
242242
margin: 16px;
243243
padding: 16px;
244-
border-radius: 12px;
244+
border-radius: var(--ha-border-radius-lg);
245245
background-color: var(--primary-background-color);
246246
}
247247

gallery/src/pages/components/ha-control-button.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import { css, html, LitElement } from "lit";
99
import { customElement } from "lit/decorators";
1010
import { ifDefined } from "lit/directives/if-defined";
1111
import { repeat } from "lit/directives/repeat";
12-
import "../../../../src/components/ha-control-button";
1312
import "../../../../src/components/ha-card";
14-
import "../../../../src/components/ha-svg-icon";
13+
import "../../../../src/components/ha-control-button";
1514
import "../../../../src/components/ha-control-button-group";
15+
import "../../../../src/components/ha-svg-icon";
1616

1717
interface Button {
1818
label: string;
@@ -156,17 +156,17 @@ export class DemoHaBarButton extends LitElement {
156156
--control-button-icon-color: var(--primary-color);
157157
--control-button-background-color: var(--primary-color);
158158
--control-button-background-opacity: 0.2;
159-
--control-button-border-radius: 18px;
159+
--control-button-border-radius: var(--ha-border-radius-xl);
160160
height: 100px;
161161
width: 100px;
162162
}
163163
.custom-group {
164164
--control-button-group-thickness: 100px;
165-
--control-button-group-border-radius: 36px;
165+
--control-button-group-border-radius: var(--ha-border-radius-6xl);
166166
--control-button-group-spacing: 20px;
167167
}
168168
.custom-group ha-control-button {
169-
--control-button-border-radius: 18px;
169+
--control-button-border-radius: var(--ha-border-radius-xl);
170170
--mdc-icon-size: 32px;
171171
}
172172
.vertical-buttons {

gallery/src/pages/components/ha-control-number-buttons.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
import type { TemplateResult } from "lit";
22
import { LitElement, css, html } from "lit";
33
import { customElement, state } from "lit/decorators";
4+
import { ifDefined } from "lit/directives/if-defined";
5+
import { repeat } from "lit/directives/repeat";
46
import "../../../../src/components/ha-card";
57
import "../../../../src/components/ha-control-number-buttons";
6-
import { repeat } from "lit/directives/repeat";
7-
import { ifDefined } from "lit/directives/if-defined";
88

99
const buttons: {
1010
id: string;
@@ -94,7 +94,7 @@ export class DemoHarControlNumberButtons extends LitElement {
9494
--control-number-buttons-background-color: #2196f3;
9595
--control-number-buttons-background-opacity: 0.1;
9696
--control-number-buttons-thickness: 100px;
97-
--control-number-buttons-border-radius: 36px;
97+
--control-number-buttons-border-radius: var(--ha-border-radius-6xl);
9898
}
9999
`;
100100
}

gallery/src/pages/components/ha-control-select-menu.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ export class DemoHaControlSelectMenu extends LitElement {
131131
--control-button-icon-color: var(--primary-color);
132132
--control-button-background-color: var(--primary-color);
133133
--control-button-background-opacity: 0.2;
134-
--control-button-border-radius: 18px;
134+
--control-button-border-radius: var(--ha-border-radius-xl);
135135
height: 100px;
136136
width: 100px;
137137
}

0 commit comments

Comments
 (0)