Compare commits

..

25 Commits

Author SHA1 Message Date
Jan-Philipp Benecke
b6ee89ff05 Fix formatting of position slider tooltip in media player more info 2025-10-03 22:53:38 +02:00
Wendelin
fdd66b5cec Use border radius design tokens in codebase (#27169)
Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com>
2025-10-03 11:11:30 +00:00
Petar Petrov
76c9723c71 Show the total value in energy graphs (#27265)
* Show the total value in energy graphs

* format

* Apply suggestions from code review

Co-authored-by: Bram Kragten <mail@bramkragten.nl>

---------

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
2025-10-03 13:01:29 +02:00
Jan-Philipp Benecke
b02368b9c6 Make ha-slider not depend on font sizes (#27294) 2025-10-03 12:49:29 +02:00
Wendelin
0bcb7897c9 Fix mobile ha-dialog height in Browser (#27298)
Enhance dialog responsiveness by adjusting min/max height to use svh units
2025-10-03 12:48:08 +02:00
Norbert Rittel
786bbb3850 Capitalize two occurrences of "YAML" abbreviation (#27314) 2025-10-03 12:45:29 +02:00
renovate[bot]
e8ead84fe5 Update dependency barcode-detector to v3.0.6 (#27318)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-03 12:45:06 +02:00
karwosts
428e7fb332 Add a placeholder hint for template selector (#27297)
Add a placeholder for template selector
2025-10-03 08:38:58 +03:00
karwosts
ad9e8d5a52 Add entity sub-editor to picture glance (#27312) 2025-10-03 08:32:39 +03:00
renovate[bot]
e3cf04b3d1 Update octokit monorepo to v8.0.2 (#27308)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-03 06:46:49 +02:00
renovate[bot]
10c3042db1 Update dependency typescript-eslint to v8.45.0 (#27309)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-03 06:46:25 +02:00
karwosts
25f6b7de2f Add energy compare with previous year (#25037)
* Add energy compare with previous year

* minor text adjustment

---------

Co-authored-by: Petar Petrov <MindFreeze@users.noreply.github.com>
2025-10-02 19:08:57 +03:00
Aidan Timson
ca1cda4824 Fix desktop translation for browser media source (#27293)
Fix translation for desktop
2025-10-02 16:36:12 +03:00
Wendelin
8c4a67315b Fix automation editor safe area (#27292) 2025-10-02 12:01:47 +02:00
Paul Bottein
c18de97b32 Align bottom sheet border radius with resizable bottom sheet (#27280) 2025-10-02 11:44:54 +02:00
renovate[bot]
23a3ca3ed7 Update dependency @rspack/core to v1.5.8 (#27291)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-02 12:32:44 +03:00
Jan-Philipp Benecke
69457b4e85 Support redo on Shift+CMD+Z (#27287)
* Support redo on Shift+CMD+Z

* Update redo shortcut for macOS to CMD+Shift+Z
2025-10-02 11:56:56 +03:00
Wendelin
2e096c23e0 Remove @shoelace-style from babelOptions exclusion list (#27289) 2025-10-02 10:33:23 +02:00
karwosts
552691e200 Add a sub-editor to hui-entity-editor (#27157)
* Add a sub-editor to hui-entity-editor

* item styling
2025-10-02 08:19:24 +03:00
renovate[bot]
91258c86c1 Update dependency @codemirror/view to v6.38.4 (#27288)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-02 08:06:29 +03:00
renovate[bot]
3750a378cd Update dependency lint-staged to v16.2.3 (#27285)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-01 19:29:17 +02:00
Petar Petrov
12d3304c72 Add hide_compound_stats option to energy-devices-graph-card (#27263)
* Add hide_compound_stats option to energy-devices-graph-card

* Update src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts

Co-authored-by: Bram Kragten <mail@bramkragten.nl>

* format

---------

Co-authored-by: Bram Kragten <mail@bramkragten.nl>
2025-10-01 16:24:10 +03:00
renovate[bot]
246100809d Update dependency lint-staged to v16.2.2 (#27276)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-10-01 12:38:43 +02:00
Michael Herger
6efca93186 Introduce new number formatting for Switzerland (#27268) 2025-10-01 11:08:25 +02:00
Simon Lamon
6280647b9a ha-refresh-tokens-card: Replace ha-button-menu to ha-md-button-menu (#26874) 2025-10-01 10:45:34 +02:00
244 changed files with 1562 additions and 914 deletions

View File

@@ -183,7 +183,6 @@ module.exports.babelOptions = ({
include: /\/node_modules\//,
exclude: [
"element-internals-polyfill",
"@shoelace-style",
"@?lit(?:-labs|-element|-html)?",
].map((p) => new RegExp(`/node_modules/${p}/`)),
},

View File

@@ -242,7 +242,7 @@ class HcCast extends LitElement {
}
.question:before {
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
position: absolute;
top: 0;
right: 0;

View File

@@ -95,7 +95,8 @@ class HcLayout extends LitElement {
}
.hero {
border-radius: 4px 4px 0 0;
border-radius: var(--ha-border-radius-sm) var(--ha-border-radius-sm)
var(--ha-border-radius-square) var(--ha-border-radius-square);
}
.subtitle {
font-size: var(--ha-font-size-m);

View File

@@ -208,7 +208,7 @@ class HaGallery extends LitElement {
}
.sidebar a[active]::before {
border-radius: 12px;
border-radius: var(--ha-border-radius-lg);
position: absolute;
top: 0;
right: 2px;
@@ -241,7 +241,7 @@ class HaGallery extends LitElement {
text-align: center;
margin: 16px;
padding: 16px;
border-radius: 12px;
border-radius: var(--ha-border-radius-lg);
background-color: var(--primary-background-color);
}

View File

@@ -9,10 +9,10 @@ import { css, html, LitElement } from "lit";
import { customElement } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
import { repeat } from "lit/directives/repeat";
import "../../../../src/components/ha-control-button";
import "../../../../src/components/ha-card";
import "../../../../src/components/ha-svg-icon";
import "../../../../src/components/ha-control-button";
import "../../../../src/components/ha-control-button-group";
import "../../../../src/components/ha-svg-icon";
interface Button {
label: string;
@@ -156,17 +156,17 @@ export class DemoHaBarButton extends LitElement {
--control-button-icon-color: var(--primary-color);
--control-button-background-color: var(--primary-color);
--control-button-background-opacity: 0.2;
--control-button-border-radius: 18px;
--control-button-border-radius: var(--ha-border-radius-xl);
height: 100px;
width: 100px;
}
.custom-group {
--control-button-group-thickness: 100px;
--control-button-group-border-radius: 36px;
--control-button-group-border-radius: var(--ha-border-radius-6xl);
--control-button-group-spacing: 20px;
}
.custom-group ha-control-button {
--control-button-border-radius: 18px;
--control-button-border-radius: var(--ha-border-radius-xl);
--mdc-icon-size: 32px;
}
.vertical-buttons {

View File

@@ -1,10 +1,10 @@
import type { TemplateResult } from "lit";
import { LitElement, css, html } from "lit";
import { customElement, state } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
import { repeat } from "lit/directives/repeat";
import "../../../../src/components/ha-card";
import "../../../../src/components/ha-control-number-buttons";
import { repeat } from "lit/directives/repeat";
import { ifDefined } from "lit/directives/if-defined";
const buttons: {
id: string;
@@ -94,7 +94,7 @@ export class DemoHarControlNumberButtons extends LitElement {
--control-number-buttons-background-color: #2196f3;
--control-number-buttons-background-opacity: 0.1;
--control-number-buttons-thickness: 100px;
--control-number-buttons-border-radius: 36px;
--control-number-buttons-border-radius: var(--ha-border-radius-6xl);
}
`;
}

View File

@@ -131,7 +131,7 @@ export class DemoHaControlSelectMenu extends LitElement {
--control-button-icon-color: var(--primary-color);
--control-button-background-color: var(--primary-color);
--control-button-background-opacity: 0.2;
--control-button-border-radius: 18px;
--control-button-border-radius: var(--ha-border-radius-xl);
height: 100px;
width: 100px;
}

View File

@@ -187,7 +187,7 @@ export class DemoHaControlSelect extends LitElement {
--mdc-icon-size: 24px;
--control-select-color: var(--state-fan-active-color);
--control-select-thickness: 130px;
--control-select-border-radius: 36px;
--control-select-border-radius: var(--ha-border-radius-6xl);
}
.vertical-selects {
height: 300px;

View File

@@ -3,8 +3,8 @@ import { css, html, LitElement } from "lit";
import { customElement, state } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
import { repeat } from "lit/directives/repeat";
import "../../../../src/components/ha-control-slider";
import "../../../../src/components/ha-card";
import "../../../../src/components/ha-control-slider";
const sliders: {
id: string;
@@ -151,7 +151,7 @@ export class DemoHaBarSlider extends LitElement {
--control-slider-background: #ffcf4c;
--control-slider-background-opacity: 0.2;
--control-slider-thickness: 130px;
--control-slider-border-radius: 36px;
--control-slider-border-radius: var(--ha-border-radius-6xl);
}
.vertical-sliders {
height: 300px;

View File

@@ -9,8 +9,8 @@ import { css, html, LitElement } from "lit";
import { customElement, state } from "lit/decorators";
import { ifDefined } from "lit/directives/if-defined";
import { repeat } from "lit/directives/repeat";
import "../../../../src/components/ha-control-switch";
import "../../../../src/components/ha-card";
import "../../../../src/components/ha-control-switch";
const switches: {
id: string;
@@ -118,7 +118,7 @@ export class DemoHaControlSwitch extends LitElement {
--control-switch-on-color: var(--green-color);
--control-switch-off-color: var(--red-color);
--control-switch-thickness: 130px;
--control-switch-border-radius: 36px;
--control-switch-border-radius: var(--ha-border-radius-6xl);
--control-switch-padding: 6px;
--mdc-icon-size: 24px;
}

View File

@@ -131,7 +131,7 @@ export class DemoHaSelectBox extends LitElement {
--mdc-icon-size: 24px;
--control-select-color: var(--state-fan-active-color);
--control-select-thickness: 130px;
--control-select-border-radius: 36px;
--control-select-border-radius: var(--ha-border-radius-6xl);
}
p.title {

View File

@@ -79,7 +79,7 @@ export class DemoHaSlider extends LitElement {
background-color: var(--primary-background-color);
padding: 0 50px;
margin: 16px;
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
}
ha-card {
margin: 24px auto;

View File

@@ -61,7 +61,7 @@ export class DemoHaSpinner extends LitElement {
background-color: var(--primary-background-color);
padding: 0 50px;
margin: 16px;
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
}
ha-card {
margin: 24px auto;

View File

@@ -5,13 +5,13 @@ import type {
import { css, html, LitElement, nothing } from "lit";
import { customElement, property } from "lit/decorators";
import memoizeOne from "memoize-one";
import { mockIcons } from "../../../../demo/src/stubs/icons";
import { computeDomain } from "../../../../src/common/entity/compute_domain";
import { computeStateDisplay } from "../../../../src/common/entity/compute_state_display";
import "../../../../src/components/data-table/ha-data-table";
import type { DataTableColumnContainer } from "../../../../src/components/data-table/ha-data-table";
import "../../../../src/components/entity/state-badge";
import { provideHass } from "../../../../src/fake_data/provide_hass";
import { mockIcons } from "../../../../demo/src/stubs/icons";
import type { HomeAssistant } from "../../../../src/types";
const SENSOR_DEVICE_CLASSES = [
@@ -434,7 +434,7 @@ export class DemoEntityState extends LitElement {
display: block;
height: 20px;
width: 20px;
border-radius: 10px;
border-radius: var(--ha-border-radius-md);
background-color: rgb(--color);
}
`;

View File

@@ -121,7 +121,7 @@ class HassioCardContent extends LitElement {
height: 12px;
top: 8px;
right: 8px;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.topbar {
position: absolute;

View File

@@ -164,7 +164,7 @@ class HassioHardwareDialog extends LitElement {
pre,
code {
background-color: var(--markdown-code-background-color, none);
border-radius: 3px;
border-radius: var(--ha-border-radius-sm);
}
pre {
padding: 16px;

View File

@@ -228,7 +228,7 @@ class HassioRegistriesDialog extends LitElement {
css`
.registry {
border: 1px solid var(--divider-color);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
margin-top: 4px;
}
.action {

View File

@@ -193,7 +193,7 @@ class HassioRepositoriesDialog extends LitElement {
}
.option {
border: 1px solid var(--divider-color);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
margin-top: 4px;
}
ha-button {

View File

@@ -302,7 +302,7 @@ class LandingPageLogs extends LitElement {
max-height: 300px;
overflow: auto;
border: 1px solid var(--divider-color);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
padding: 4px;
}

View File

@@ -221,7 +221,7 @@ class HaLandingPage extends LandingPageBaseElement {
ha-language-picker {
display: block;
width: 200px;
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
overflow: hidden;
--ha-select-height: 40px;
--mdc-select-fill-color: none;

View File

@@ -34,7 +34,7 @@
"@codemirror/legacy-modes": "6.5.1",
"@codemirror/search": "6.5.11",
"@codemirror/state": "6.5.2",
"@codemirror/view": "6.38.3",
"@codemirror/view": "6.38.4",
"@date-fns/tz": "1.4.1",
"@egjs/hammerjs": "2.0.17",
"@formatjs/intl-datetimeformat": "6.18.0",
@@ -96,7 +96,7 @@
"@webcomponents/scoped-custom-element-registry": "0.0.10",
"@webcomponents/webcomponentsjs": "2.8.0",
"app-datepicker": "5.1.1",
"barcode-detector": "3.0.5",
"barcode-detector": "3.0.6",
"color-name": "2.0.2",
"comlink": "4.4.2",
"core-js": "3.45.1",
@@ -154,11 +154,11 @@
"@babel/preset-env": "7.28.3",
"@bundle-stats/plugin-webpack-filter": "4.21.3",
"@lokalise/node-api": "15.2.1",
"@octokit/auth-oauth-device": "8.0.1",
"@octokit/plugin-retry": "8.0.1",
"@octokit/auth-oauth-device": "8.0.2",
"@octokit/plugin-retry": "8.0.2",
"@octokit/rest": "22.0.0",
"@rsdoctor/rspack-plugin": "1.3.1",
"@rspack/core": "1.5.7",
"@rspack/core": "1.5.8",
"@rspack/dev-server": "1.1.4",
"@types/babel__plugin-transform-runtime": "7.9.5",
"@types/chromecast-caf-receiver": "6.0.22",
@@ -203,7 +203,7 @@
"husky": "9.1.7",
"jsdom": "27.0.0",
"jszip": "3.10.1",
"lint-staged": "16.2.1",
"lint-staged": "16.2.3",
"lit-analyzer": "2.0.3",
"lodash.merge": "4.6.2",
"lodash.template": "4.5.0",
@@ -217,7 +217,7 @@
"terser-webpack-plugin": "5.3.14",
"ts-lit-plugin": "2.0.2",
"typescript": "5.9.2",
"typescript-eslint": "8.44.1",
"typescript-eslint": "8.45.0",
"vite-tsconfig-paths": "5.1.4",
"vitest": "3.2.4",
"webpack-stats-plugin": "1.1.3",

View File

@@ -103,7 +103,10 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
);
box-shadow: var(--ha-card-box-shadow, none);
box-sizing: border-box;
border-radius: var(--ha-card-border-radius, 12px);
border-radius: var(
--ha-card-border-radius,
var(--ha-border-radius-lg)
);
border-width: var(--ha-card-border-width, 1px);
border-style: solid;
border-color: var(
@@ -132,7 +135,7 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
}
ha-language-picker {
width: 200px;
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
overflow: hidden;
--ha-select-height: 40px;
--mdc-select-fill-color: none;

View File

@@ -32,6 +32,8 @@ export const numberFormatToLocale = (
return ["de", "es", "it"]; // Use German with fallback to Spanish then Italian formatting 1.234.567,89
case NumberFormat.space_comma:
return ["fr", "sv", "cs"]; // Use French with fallback to Swedish and Czech formatting 1 234 567,89
case NumberFormat.quote_decimal:
return ["de-CH"]; // Use German (Switzerland) formatting 1'234'567.89
case NumberFormat.system:
return undefined;
default:

View File

@@ -1,5 +1,5 @@
import { consume } from "@lit/context";
import { ResizeController } from "@lit-labs/observers/resize-controller";
import { consume } from "@lit/context";
import { mdiChevronDown, mdiChevronUp, mdiRestart } from "@mdi/js";
import { differenceInMinutes } from "date-fns";
import type { DataZoomComponentOption } from "echarts/components";
@@ -7,15 +7,16 @@ import type { EChartsType } from "echarts/core";
import type {
ECElementEvent,
LegendComponentOption,
LineSeriesOption,
XAXisOption,
YAXisOption,
LineSeriesOption,
} from "echarts/types/dist/shared";
import type { PropertyValues } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import { styleMap } from "lit/directives/style-map";
import { ensureArray } from "../../common/array/ensure-array";
import { getAllGraphColors } from "../../common/color/colors";
import { fireEvent } from "../../common/dom/fire_event";
import { listenMediaQuery } from "../../common/dom/media_query";
@@ -24,10 +25,9 @@ import type { Themes } from "../../data/ws-themes";
import type { ECOption } from "../../resources/echarts";
import type { HomeAssistant } from "../../types";
import { isMac } from "../../util/is_mac";
import "../chips/ha-assist-chip";
import "../ha-icon-button";
import { formatTimeLabel } from "./axis-label";
import { ensureArray } from "../../common/array/ensure-array";
import "../chips/ha-assist-chip";
import { downSampleLineData } from "./down-sample";
export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
@@ -983,7 +983,7 @@ export class HaChartBase extends LitElement {
.chart-controls ha-icon-button,
.chart-controls ::slotted(ha-icon-button) {
background: var(--card-background-color);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
--mdc-icon-button-size: 32px;
color: var(--primary-color);
border: 1px solid var(--divider-color);
@@ -1036,7 +1036,7 @@ export class HaChartBase extends LitElement {
.chart-legend .bullet {
border-width: 1px;
border-style: solid;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
display: block;
height: 16px;
width: 16px;

View File

@@ -290,7 +290,9 @@ export class DialogDataTableSettings extends LitElement {
ha-dialog {
--vertical-align-dialog: flex-start;
--dialog-surface-margin-top: 250px;
--ha-dialog-border-radius: 28px 28px 0 0;
--ha-dialog-border-radius: var(--ha-border-radius-4xl)
var(--ha-border-radius-4xl) var(--ha-border-radius-square)
var(--ha-border-radius-square);
--mdc-dialog-min-height: calc(100% - 250px);
--mdc-dialog-max-height: calc(100% - 250px);
}

View File

@@ -1053,7 +1053,7 @@ export class HaDataTable extends LitElement {
.mdc-data-table {
background-color: var(--data-table-background-color);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
border-width: 1px;
border-style: solid;
border-color: var(--divider-color);

View File

@@ -4,11 +4,11 @@ import Vue from "vue";
import DateRangePicker from "vue2-daterange-picker";
// @ts-ignore
import dateRangePickerStyles from "vue2-daterange-picker/dist/vue2-daterange-picker.css";
import { fireEvent } from "../common/dom/fire_event";
import {
localizeWeekdays,
localizeMonths,
localizeWeekdays,
} from "../common/datetime/localize_date";
import { fireEvent } from "../common/dom/fire_event";
import { mainWindow } from "../common/dom/get_main_window";
// eslint-disable-next-line @typescript-eslint/naming-convention
@@ -177,7 +177,7 @@ class DateRangePickerElement extends WrappedElement {
top: auto;
box-shadow: var(--ha-card-box-shadow, none);
background-color: var(--card-background-color);
border-radius: var(--ha-card-border-radius, 12px);
border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
border-width: var(--ha-card-border-width, 1px);
border-style: solid;
border-color: var(
@@ -203,7 +203,7 @@ class DateRangePickerElement extends WrappedElement {
.daterangepicker .calendar-table th {
background-color: transparent;
color: var(--secondary-text-color);
border-radius: 0;
border-radius: var(--ha-border-radius-square);
outline: none;
min-width: 32px;
height: 32px;
@@ -225,13 +225,13 @@ class DateRangePickerElement extends WrappedElement {
color: var(--text-primary-color);
}
.daterangepicker td.start-date.end-date {
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.daterangepicker td.start-date {
border-radius: 50% 0 0 50%;
border-radius: var(--ha-border-radius-circle) var(--ha-border-radius-square) var(--ha-border-radius-square) var(--ha-border-radius-circle);
}
.daterangepicker td.end-date {
border-radius: 0 50% 50% 0;
border-radius: var(--ha-border-radius-square) var(--ha-border-radius-circle) var(--ha-border-radius-circle) var(--ha-border-radius-square);
}
.reportrange-text {
background: none !important;
@@ -265,7 +265,7 @@ class DateRangePickerElement extends WrappedElement {
border: 1px solid var(--primary-color);
background-color: transparent;
color: var(--primary-color);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
padding: 8px;
cursor: pointer;
}
@@ -321,10 +321,10 @@ class DateRangePickerElement extends WrappedElement {
-webkit-transform: rotate(-45deg);
}
.daterangepicker td.start-date {
border-radius: 0 50% 50% 0;
border-radius: var(--ha-border-radius-square) var(--ha-border-radius-circle) var(--ha-border-radius-circle) var(--ha-border-radius-square);
}
.daterangepicker td.end-date {
border-radius: 50% 0 0 50%;
border-radius: var(--ha-border-radius-circle) var(--ha-border-radius-square) var(--ha-border-radius-square) var(--ha-border-radius-circle);
}
`;
}

View File

@@ -236,7 +236,7 @@ export class StateBadge extends LitElement {
border-radius: var(--state-badge-with-media-image-border-radius, 8%);
}
:host(.has-no-radius) {
border-radius: 0;
border-radius: var(--ha-border-radius-square);
}
:host(:focus) {
outline: none;

View File

@@ -99,7 +99,7 @@ class HaAlert extends LitElement {
opacity: 0.12;
pointer-events: none;
content: "";
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
}
.icon.no-title {
align-self: center;

View File

@@ -1,24 +1,24 @@
import type { PropertyValues, TemplateResult } from "lit";
import { css, LitElement, html, nothing } from "lit";
import { mdiAlertCircle, mdiMicrophone, mdiSend } from "@mdi/js";
import type { PropertyValues, TemplateResult } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import type { HomeAssistant } from "../types";
import { supportsFeature } from "../common/entity/supports-feature";
import {
type PipelineRunEvent,
runAssistPipeline,
type AssistPipeline,
type ConversationChatLogAssistantDelta,
type ConversationChatLogToolResultDelta,
type PipelineRunEvent,
} from "../data/assist_pipeline";
import { supportsFeature } from "../common/entity/supports-feature";
import { ConversationEntityFeature } from "../data/conversation";
import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
import type { HomeAssistant } from "../types";
import { AudioRecorder } from "../util/audio-recorder";
import { documentationUrl } from "../util/documentation-url";
import "./ha-alert";
import "./ha-textfield";
import type { HaTextField } from "./ha-textfield";
import { documentationUrl } from "../util/documentation-url";
import { showAlertDialog } from "../dialogs/generic/show-dialog-box";
interface AssistMessage {
who: string;
@@ -591,7 +591,7 @@ export class HaAssistChat extends LitElement {
clear: both;
margin: 8px 0;
padding: 8px;
border-radius: 15px;
border-radius: var(--ha-border-radius-xl);
}
.message:last-child {
margin-bottom: 0;
@@ -659,7 +659,7 @@ export class HaAssistChat extends LitElement {
.double-bounce2 {
width: 48px;
height: 48px;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
background-color: var(--primary-color);
opacity: 0.2;
position: absolute;

View File

@@ -122,7 +122,7 @@ export class HaBadge extends LitElement {
::slotted(img[slot="icon"]) {
width: 30px;
height: 30px;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
object-fit: cover;
overflow: hidden;
margin-left: -10px;

View File

@@ -46,7 +46,7 @@ export class HaBar extends LitElement {
fill: var(--ha-bar-primary-color, var(--primary-color));
}
svg {
border-radius: var(--ha-bar-border-radius, 4px);
border-radius: var(--ha-bar-border-radius, var(--ha-border-radius-sm));
height: 12px;
width: 100%;
}

View File

@@ -337,7 +337,9 @@ export class HaBaseTimeInput extends LitElement {
.time-input-wrap {
display: flex;
flex: var(--time-input-flex, unset);
border-radius: var(--mdc-shape-small, 4px) var(--mdc-shape-small, 4px) 0 0;
border-radius: var(--mdc-shape-small, var(--ha-border-radius-sm))
var(--mdc-shape-small, var(--ha-border-radius-sm))
var(--ha-border-radius-square) var(--ha-border-radius-square);
overflow: hidden;
position: relative;
direction: ltr;

View File

@@ -42,8 +42,8 @@ export class HaBottomSheet extends LitElement {
static styles = css`
wa-drawer {
--wa-color-surface-raised: var(
--ha-dialog-surface-background,
var(--mdc-theme-surface, #fff)
--ha-bottom-sheet-surface-background,
var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
);
--spacing: 0;
--size: auto;
@@ -51,8 +51,14 @@ export class HaBottomSheet extends LitElement {
--hide-duration: ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms;
}
wa-drawer::part(dialog) {
border-top-left-radius: var(--ha-border-radius-lg);
border-top-right-radius: var(--ha-border-radius-lg);
border-top-left-radius: var(
--ha-bottom-sheet-border-radius,
var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
);
border-top-right-radius: var(
--ha-bottom-sheet-border-radius,
var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
);
max-height: 90vh;
padding-bottom: var(--safe-area-inset-bottom);
padding-left: var(--safe-area-inset-left);

View File

@@ -17,7 +17,7 @@ export class HaCard extends LitElement {
backdrop-filter: var(--ha-card-backdrop-filter, none);
box-shadow: var(--ha-card-box-shadow, none);
box-sizing: border-box;
border-radius: var(--ha-card-border-radius, 12px);
border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
border-width: var(--ha-card-border-width, 1px);
border-style: solid;
border-color: var(--ha-card-border-color, var(--divider-color, #e0e0e0));

View File

@@ -45,7 +45,7 @@ export class HaCodeEditorCompletionItems extends LitElement {
margin: 0 3px;
padding: 3px;
background-color: var(--markdown-code-background-color, none);
border-radius: var(--ha-border-radius-sm, 4px);
border-radius: var(--ha-border-radius-sm);
line-height: var(--ha-line-height-condensed);
}
`;

View File

@@ -5,19 +5,20 @@ import type {
CompletionResult,
CompletionSource,
} from "@codemirror/autocomplete";
import { undo, undoDepth, redo, redoDepth } from "@codemirror/commands";
import { redo, redoDepth, undo, undoDepth } from "@codemirror/commands";
import type { Extension, TransactionSpec } from "@codemirror/state";
import type { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view";
import { placeholder } from "@codemirror/view";
import {
mdiArrowExpand,
mdiArrowCollapse,
mdiArrowExpand,
mdiContentCopy,
mdiUndo,
mdiRedo,
mdiUndo,
} from "@mdi/js";
import type { HassEntities } from "home-assistant-js-websocket";
import type { PropertyValues } from "lit";
import { css, ReactiveElement, html, render } from "lit";
import { css, html, ReactiveElement, render } from "lit";
import { customElement, property, state } from "lit/decorators";
import memoizeOne from "memoize-one";
import { fireEvent } from "../common/dom/fire_event";
@@ -81,6 +82,8 @@ export class HaCodeEditor extends ReactiveElement {
@property({ type: Boolean, attribute: "has-toolbar" })
public hasToolbar = true;
@property({ type: String }) public placeholder?: string;
@state() private _value = "";
@state() private _isFullscreen = false;
@@ -264,6 +267,7 @@ export class HaCodeEditor extends ReactiveElement {
this._loadedCodeMirror.foldingCompartment.of(
this._getFoldingExtensions()
),
...(this.placeholder ? [placeholder(this.placeholder)] : []),
];
if (!this.readOnly) {
@@ -774,7 +778,7 @@ export class HaCodeEditor extends ReactiveElement {
right: 8px !important;
bottom: 8px !important;
z-index: 6;
border-radius: 12px !important;
border-radius: var(--ha-border-radius-lg) !important;
box-shadow: 0 2px 10px rgba(0, 0, 0, 0.3) !important;
overflow: hidden !important;
background-color: var(
@@ -797,7 +801,7 @@ export class HaCodeEditor extends ReactiveElement {
:host(.fullscreen) .cm-editor {
height: 100% !important;
max-height: 100% !important;
border-radius: 0 !important;
border-radius: var(--ha-border-radius-square) !important;
}
:host(:not(.hasToolbar)) .code-editor-toolbar {

View File

@@ -155,7 +155,7 @@ export class HaColorPicker extends LitElement {
display: block;
background-color: var(--circle-color, var(--divider-color));
border: 1px solid var(--outline-color);
border-radius: 10px;
border-radius: var(--ha-border-radius-pill);
width: 20px;
height: 20px;
box-sizing: border-box;

View File

@@ -32,7 +32,7 @@ export class HaControlButton extends LitElement {
--control-button-icon-color: var(--primary-text-color);
--control-button-background-color: var(--disabled-color);
--control-button-background-opacity: 0.2;
--control-button-border-radius: 10px;
--control-button-border-radius: var(--ha-border-radius-md);
--control-button-padding: 8px;
--mdc-icon-size: 20px;
--ha-ripple-color: var(--secondary-text-color);

View File

@@ -187,7 +187,7 @@ export class HaControlNumberButton extends LitElement {
--control-number-buttons-focus-color: var(--secondary-text-color);
--control-number-buttons-background-color: var(--disabled-color);
--control-number-buttons-background-opacity: 0.2;
--control-number-buttons-border-radius: 10px;
--control-number-buttons-border-radius: var(--ha-border-radius-md);
--mdc-icon-size: 16px;
height: var(--feature-height);
width: 100%;

View File

@@ -174,7 +174,7 @@ export class HaControlSelectMenu extends SelectBase {
--control-select-menu-text-color: var(--primary-text-color);
--control-select-menu-background-color: var(--disabled-color);
--control-select-menu-background-opacity: 0.2;
--control-select-menu-border-radius: 14px;
--control-select-menu-border-radius: var(--ha-border-radius-lg);
--control-select-menu-height: 48px;
--control-select-menu-padding: 6px 10px;
--mdc-icon-size: 20px;

View File

@@ -380,7 +380,7 @@ export class HaControlSlider extends LitElement {
--control-slider-background: var(--disabled-color);
--control-slider-background-opacity: 0.2;
--control-slider-thickness: 40px;
--control-slider-border-radius: 10px;
--control-slider-border-radius: var(--ha-border-radius-md);
--control-slider-tooltip-font-size: var(--ha-font-size-m);
height: var(--control-slider-thickness);
width: 100%;
@@ -403,7 +403,7 @@ export class HaControlSlider extends LitElement {
background-color: var(--clear-background-color);
color: var(--primary-text-color);
font-size: var(--control-slider-tooltip-font-size);
border-radius: 0.8em;
border-radius: var(--ha-border-radius-lg);
padding: 0.2em 0.4em;
opacity: 0;
white-space: nowrap;

View File

@@ -157,7 +157,7 @@ export class HaControlSwitch extends LitElement {
--control-switch-off-color: var(--disabled-color);
--control-switch-background-opacity: 0.2;
--control-switch-thickness: 40px;
--control-switch-border-radius: 12px;
--control-switch-border-radius: var(--ha-border-radius-lg);
--control-switch-padding: 4px;
--mdc-icon-size: 20px;
height: var(--control-switch-thickness);

View File

@@ -123,7 +123,10 @@ export class HaDialog extends DialogBase {
margin-top: var(--dialog-surface-margin-top);
min-width: var(--mdc-dialog-min-width, 100vw);
min-height: var(--mdc-dialog-min-height, auto);
border-radius: var(--ha-dialog-border-radius, 24px);
border-radius: var(
--ha-dialog-border-radius,
var(--ha-border-radius-3xl)
);
-webkit-backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none);
background: var(
@@ -139,7 +142,9 @@ export class HaDialog extends DialogBase {
@media all and (max-width: 450px), all and (max-height: 500px) {
.mdc-dialog .mdc-dialog__surface {
min-height: 100vh;
min-height: 100svh;
max-height: 100vh;
max-height: 100svh;
padding-top: var(--safe-area-inset-top);
padding-bottom: var(--safe-area-inset-bottom);
padding-left: var(--safe-area-inset-left);

View File

@@ -144,7 +144,7 @@ export class HaExpansionPanel extends LitElement {
.top {
display: flex;
align-items: center;
border-radius: var(--ha-card-border-radius, 12px);
border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
}
.top.expanded {
@@ -161,7 +161,7 @@ export class HaExpansionPanel extends LitElement {
border-width: 1px;
border-style: solid;
border-color: var(--outline-color);
border-radius: var(--ha-card-border-radius, 12px);
border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
}
.summary-icon {

View File

@@ -242,7 +242,7 @@ export class HaFileUpload extends LitElement {
align-items: center;
border: solid 1px
var(--mdc-text-field-idle-line-color, rgba(0, 0, 0, 0.42));
border-radius: var(--mdc-shape-small, 4px);
border-radius: var(--mdc-shape-small, var(--ha-border-radius-sm));
height: 100%;
}
.row {

View File

@@ -4,6 +4,7 @@ import type { CSSResultGroup, PropertyValues } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import { fireEvent } from "../common/dom/fire_event";
import { deepEqual } from "../common/util/deep-equal";
import type { Blueprints } from "../data/blueprint";
import { fetchBlueprints } from "../data/blueprint";
import type { RelatedResult } from "../data/search";
@@ -14,7 +15,6 @@ import "./ha-check-list-item";
import "./ha-expansion-panel";
import "./ha-icon-button";
import "./ha-list";
import { deepEqual } from "../common/util/deep-equal";
@customElement("ha-filter-blueprints")
export class HaFilterBlueprints extends LitElement {
@@ -189,7 +189,7 @@ export class HaFilterBlueprints extends LitElement {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -207,7 +207,7 @@ export class HaFilterBlueprints extends LitElement {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -12,6 +12,7 @@ import type { CSSResultGroup } from "lit";
import { LitElement, css, html, nothing } from "lit";
import { customElement, property, state } from "lit/decorators";
import { fireEvent } from "../common/dom/fire_event";
import { stopPropagation } from "../common/dom/stop_propagation";
import type { CategoryRegistryEntry } from "../data/category_registry";
import {
createCategoryRegistryEntry,
@@ -24,12 +25,11 @@ import { SubscribeMixin } from "../mixins/subscribe-mixin";
import { showCategoryRegistryDetailDialog } from "../panels/config/category/show-dialog-category-registry-detail";
import { haStyleScrollbar } from "../resources/styles";
import type { HomeAssistant } from "../types";
import "./ha-button-menu";
import "./ha-expansion-panel";
import "./ha-icon";
import "./ha-button-menu";
import "./ha-list-item";
import "./ha-list";
import { stopPropagation } from "../common/dom/stop_propagation";
import "./ha-list-item";
@customElement("ha-filter-categories")
export class HaFilterCategories extends SubscribeMixin(LitElement) {
@@ -284,7 +284,7 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -302,7 +302,7 @@ export class HaFilterCategories extends SubscribeMixin(LitElement) {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -216,7 +216,7 @@ export class HaFilterDevices extends LitElement {
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -234,7 +234,7 @@ export class HaFilterDevices extends LitElement {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -170,7 +170,7 @@ export class HaFilterDomains extends LitElement {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -188,7 +188,7 @@ export class HaFilterDomains extends LitElement {
margin-inline-end: initial;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -7,6 +7,7 @@ import { fireEvent } from "../common/dom/fire_event";
import { computeStateDomain } from "../common/entity/compute_state_domain";
import { computeStateName } from "../common/entity/compute_state_name";
import { stringCompare } from "../common/string/compare";
import { deepEqual } from "../common/util/deep-equal";
import type { RelatedResult } from "../data/search";
import { findRelated } from "../data/search";
import { haStyleScrollbar } from "../resources/styles";
@@ -17,7 +18,6 @@ import "./ha-expansion-panel";
import "./ha-list";
import "./ha-state-icon";
import "./search-input-outlined";
import { deepEqual } from "../common/util/deep-equal";
@customElement("ha-filter-entities")
export class HaFilterEntities extends LitElement {
@@ -231,7 +231,7 @@ export class HaFilterEntities extends LitElement {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -249,7 +249,7 @@ export class HaFilterEntities extends LitElement {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -7,6 +7,7 @@ import { repeat } from "lit/directives/repeat";
import memoizeOne from "memoize-one";
import { fireEvent } from "../common/dom/fire_event";
import { computeRTL } from "../common/util/compute_rtl";
import { deepEqual } from "../common/util/deep-equal";
import { getFloorAreaLookup } from "../data/floor_registry";
import type { RelatedResult } from "../data/search";
import { findRelated } from "../data/search";
@@ -20,7 +21,6 @@ import "./ha-icon-button";
import "./ha-list";
import "./ha-svg-icon";
import "./ha-tree-indicator";
import { deepEqual } from "../common/util/deep-equal";
@customElement("ha-filter-floor-areas")
export class HaFilterFloorAreas extends LitElement {
@@ -281,7 +281,7 @@ export class HaFilterFloorAreas extends LitElement {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -299,7 +299,7 @@ export class HaFilterFloorAreas extends LitElement {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -8,7 +8,7 @@ import { fireEvent } from "../common/dom/fire_event";
import { stringCompare } from "../common/string/compare";
import type { LocalizeFunc } from "../common/translations/localize";
import type { IntegrationManifest } from "../data/integration";
import { fetchIntegrationManifests, domainToName } from "../data/integration";
import { domainToName, fetchIntegrationManifests } from "../data/integration";
import { haStyleScrollbar } from "../resources/styles";
import type { HomeAssistant } from "../types";
import "./ha-check-list-item";
@@ -188,7 +188,7 @@ export class HaFilterIntegrations extends LitElement {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -206,7 +206,7 @@ export class HaFilterIntegrations extends LitElement {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -214,7 +214,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -232,7 +232,7 @@ export class HaFilterLabels extends SubscribeMixin(LitElement) {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -158,7 +158,7 @@ export class HaFilterStates extends LitElement {
height: 0;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-content-padding: 0;
}
.header {
@@ -176,7 +176,7 @@ export class HaFilterStates extends LitElement {
margin-inline-end: 0;
min-width: 16px;
box-sizing: border-box;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
font-size: var(--ha-font-size-xs);
font-weight: var(--ha-font-weight-normal);
background-color: var(--primary-color);

View File

@@ -120,8 +120,8 @@ export class HaFormExpandable extends LitElement implements HaFormElement {
ha-expansion-panel {
display: block;
--expansion-panel-content-padding: 0;
border-radius: 6px;
--ha-card-border-radius: 6px;
border-radius: var(--ha-border-radius-md);
--ha-card-border-radius: var(--ha-border-radius-md);
}
ha-svg-icon,
ha-icon {

View File

@@ -264,7 +264,7 @@ export class HaGridSizeEditor extends LitElement {
left: 0;
background-color: var(--primary-color);
opacity: 0.3;
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
height: calc(var(--rows, 1) * 30px);
width: calc(var(--columns, 1) * 100% / var(--total-columns, 12));
pointer-events: none;

View File

@@ -394,7 +394,7 @@ class HaHsColorPicker extends LitElement {
width: 100%;
height: 100%;
object-fit: contain;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
cursor: pointer;
}
svg {

View File

@@ -15,7 +15,7 @@ export class HaIconButtonGroup extends LitElement {
flex-direction: row;
align-items: center;
height: 48px;
border-radius: 28px;
border-radius: var(--ha-border-radius-4xl);
background-color: rgba(139, 145, 151, 0.1);
box-sizing: border-box;
width: auto;

View File

@@ -18,7 +18,7 @@ export class HaIconButtonToggle extends HaIconButton {
opacity: 0;
transition: opacity 180ms ease-in-out;
background-color: var(--primary-text-color);
border-radius: 20px;
border-radius: var(--ha-border-radius-2xl);
height: 40px;
width: 40px;
content: "";

View File

@@ -394,7 +394,7 @@ export class HaItemDisplayEditor extends LitElement {
}
ha-md-list-item.drag-selected {
--md-focus-ring-color: rgba(var(--rgb-accent-color), 0.6);
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
outline: solid;
outline-color: rgba(var(--rgb-accent-color), 0.6);
outline-offset: -2px;

View File

@@ -89,7 +89,7 @@ class HaLabelBadge extends LitElement {
display: inline-block;
background-color: var(--ha-label-badge-color, var(--primary-color));
color: var(--ha-label-badge-label-color, white);
border-radius: 1em;
border-radius: var(--ha-border-radius-lg);
padding: 9% 16% 8% 16%; /* mostly apitalized text, not much descenders => bit more top margin */
font-weight: var(--ha-font-weight-medium);
overflow: hidden;

View File

@@ -39,7 +39,7 @@ class HaLabel extends LitElement {
vertical-align: middle;
height: 32px;
padding: 0 16px;
border-radius: 18px;
border-radius: var(--ha-border-radius-xl);
color: var(--ha-label-text-color);
--mdc-icon-size: 12px;
text-wrap: nowrap;
@@ -73,7 +73,7 @@ class HaLabel extends LitElement {
:host([dense]) {
height: 20px;
padding: 0 12px;
border-radius: 10px;
border-radius: var(--ha-border-radius-md);
}
:host([dense]) ::slotted([slot="icon"]) {
margin-right: 4px;

View File

@@ -91,7 +91,7 @@ class HaLabeledSlider extends LitElement {
flex-grow: 1;
align-items: center;
background-image: var(--ha-slider-background);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
height: 32px;
}

View File

@@ -61,7 +61,7 @@ export class HaMarkdown extends LitElement {
code,
pre {
background-color: var(--markdown-code-background-color, none);
border-radius: 3px;
border-radius: var(--ha-border-radius-sm);
}
svg {
background-color: var(--markdown-svg-background-color, none);

View File

@@ -137,7 +137,7 @@ class HaMenuButton extends LitElement {
right: 7px;
inset-inline-end: 7px;
inset-inline-start: initial;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
border: 2px solid var(--app-header-background-color);
}
`;

View File

@@ -5,9 +5,9 @@ import { ifDefined } from "lit/directives/if-defined";
import type { PageNavigation } from "../layouts/hass-tabs-subpage";
import type { HomeAssistant } from "../types";
import "./ha-icon-next";
import "./ha-svg-icon";
import "./ha-md-list";
import "./ha-md-list-item";
import "./ha-svg-icon";
@customElement("ha-navigation-list")
class HaNavigationList extends LitElement {
@@ -74,7 +74,7 @@ class HaNavigationList extends LitElement {
padding: 8px;
}
.icon-background {
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.icon-background ha-svg-icon {
color: #fff;

View File

@@ -96,7 +96,7 @@ export class HaPickerField extends LitElement {
}
ha-combo-box-item {
background-color: var(--mdc-text-field-fill-color, whitesmoke);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
border-end-end-radius: 0;
border-end-start-radius: 0;
--md-list-item-one-line-container-height: 56px;

View File

@@ -354,7 +354,7 @@ class HaQrScanner extends LitElement {
}
canvas {
width: 100%;
border-radius: 16px;
border-radius: var(--ha-border-radius-xl);
}
#canvas-container {
position: relative;
@@ -367,7 +367,7 @@ class HaQrScanner extends LitElement {
inset-inline-start: initial;
background: #727272b2;
color: white;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.row {
display: flex;

View File

@@ -1,6 +1,5 @@
import { css, html, LitElement } from "lit";
import { customElement, query, state } from "lit/decorators";
import { styleMap } from "lit/directives/style-map";
import { fireEvent } from "../common/dom/fire_event";
import { BOTTOM_SHEET_ANIMATION_DURATION_MS } from "./ha-bottom-sheet";
@@ -37,13 +36,14 @@ export class HaResizableBottomSheet extends LitElement {
return html`<dialog
open
@transitionend=${this._handleTransitionEnd}
style=${styleMap({
height: this._dialogViewportHeight
? `${this._dialogViewportHeight}vh`
: "auto",
maxHeight: `${this._dialogMaxViewpointHeight}vh`,
minHeight: `${this._dialogMinViewpointHeight}vh`,
})}
style=${`
--height: ${this._dialogViewportHeight}vh;
--height: ${this._dialogViewportHeight}dvh;
--max-height: ${this._dialogMaxViewpointHeight}vh;
--max-height: ${this._dialogMaxViewpointHeight}dvh;
--min-height: ${this._dialogMinViewpointHeight}vh;
--min-height: ${this._dialogMinViewpointHeight}dvh;
`}
>
<div class="handle-wrapper">
<div
@@ -204,7 +204,7 @@ export class HaResizableBottomSheet extends LitElement {
}
.handle-wrapper .handle::after {
content: "";
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
height: 4px;
background: var(--divider-color, #e0e0e0);
width: 80px;
@@ -213,12 +213,14 @@ export class HaResizableBottomSheet extends LitElement {
cursor: grabbing;
}
dialog {
height: auto;
max-height: 70vh;
min-height: 30vh;
height: var(--height, auto);
max-height: var(--max-height, 70vh);
max-height: var(--max-height, 70dvh);
min-height: var(--min-height, 30vh);
min-height: var(--min-height, 30dvh);
background-color: var(
--ha-dialog-surface-background,
var(--mdc-theme-surface, #fff)
--ha-bottom-sheet-surface-background,
var(--ha-dialog-surface-background, var(--mdc-theme-surface, #fff)),
);
display: flex;
flex-direction: column;
@@ -239,12 +241,12 @@ export class HaResizableBottomSheet extends LitElement {
inset-inline-start: 0;
box-shadow: 0px -8px 16px rgba(0, 0, 0, 0.2);
border-top-left-radius: var(
--ha-dialog-border-radius,
var(--ha-border-radius-2xl)
--ha-bottom-sheet-border-radius,
var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
);
border-top-right-radius: var(
--ha-dialog-border-radius,
var(--ha-border-radius-2xl)
--ha-bottom-sheet-border-radius,
var(--ha-dialog-border-radius, var(--ha-border-radius-2xl))
);
transform: translateY(100%);
transition: transform ${BOTTOM_SHEET_ANIMATION_DURATION_MS}ms ease;
@@ -254,7 +256,6 @@ export class HaResizableBottomSheet extends LitElement {
border-bottom-width: 0;
border-style: var(--ha-bottom-sheet-border-style);
border-color: var(--ha-bottom-sheet-border-color);
margin-bottom: var(--safe-area-inset-bottom);
margin-left: var(--safe-area-inset-left);
margin-right: var(--safe-area-inset-right);
}

View File

@@ -106,7 +106,7 @@ class HaSegmentedBar extends LitElement {
.bar {
display: flex;
overflow: hidden;
border-radius: var(--ha-bar-border-radius, 4px);
border-radius: var(--ha-bar-border-radius, var(--ha-border-radius-sm));
width: 100%;
height: 12px;
margin: 2px 0;
@@ -139,7 +139,7 @@ class HaSegmentedBar extends LitElement {
.legend li .bullet {
width: 12px;
height: 12px;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.spacer {
flex: 1;

View File

@@ -1,13 +1,13 @@
import { customElement, property } from "lit/decorators";
import { css, html, LitElement, nothing } from "lit";
import "./ha-radio";
import { customElement, property } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import { styleMap } from "lit/directives/style-map";
import type { HaRadio } from "./ha-radio";
import { fireEvent } from "../common/dom/fire_event";
import type { HomeAssistant } from "../types";
import { computeRTL } from "../common/util/compute_rtl";
import { stopPropagation } from "../common/dom/stop_propagation";
import { computeRTL } from "../common/util/compute_rtl";
import type { HomeAssistant } from "../types";
import "./ha-radio";
import type { HaRadio } from "./ha-radio";
interface SelectBoxOptionImage {
src: string;
@@ -122,7 +122,7 @@ export class HaSelectBox extends LitElement {
position: relative;
display: block;
border: 1px solid var(--divider-color);
border-radius: var(--ha-card-border-radius, 12px);
border-radius: var(--ha-card-border-radius, var(--ha-border-radius-lg));
display: flex;
flex-direction: column;
align-items: center;

View File

@@ -329,11 +329,11 @@ export class HaMediaSelector extends LitElement {
flex-shrink: 0;
position: relative;
box-sizing: border-box;
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
overflow: hidden;
}
ha-card .image {
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
}
.folder {
--mdc-icon-size: 24px;

View File

@@ -301,7 +301,7 @@ export class HaObjectSelector extends LitElement {
}
ha-md-list-item {
border: 1px solid var(--divider-color);
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
--ha-md-list-item-gap: 0;
--md-list-item-top-space: 0;
--md-list-item-bottom-space: 0;

View File

@@ -19,6 +19,8 @@ export class HaTemplateSelector extends LitElement {
@property() public helper?: string;
@property() public placeholder?: any;
@property({ type: Boolean }) public disabled = false;
@property({ type: Boolean }) public required = true;
@@ -55,6 +57,7 @@ export class HaTemplateSelector extends LitElement {
.hass=${this.hass}
.value=${this.value}
.readOnly=${this.disabled}
.placeholder=${this.placeholder || "{{ ... }}"}
autofocus
autocomplete-entities
autocomplete-icons

View File

@@ -13,6 +13,7 @@ import { fireEvent } from "../common/dom/fire_event";
import { computeDomain } from "../common/entity/compute_domain";
import { computeObjectId } from "../common/entity/compute_object_id";
import { supportsFeature } from "../common/entity/supports-feature";
import { hasTemplate } from "../common/string/has-template";
import {
fetchIntegrationManifest,
type IntegrationManifest,
@@ -34,11 +35,10 @@ import "./ha-checkbox";
import "./ha-icon-button";
import "./ha-selector/ha-selector";
import "./ha-service-picker";
import "./ha-service-section-icon";
import "./ha-settings-row";
import "./ha-yaml-editor";
import type { HaYamlEditor } from "./ha-yaml-editor";
import "./ha-service-section-icon";
import { hasTemplate } from "../common/string/has-template";
const attributeFilter = (values: any[], attribute: any) => {
if (typeof attribute === "object") {
@@ -999,7 +999,7 @@ export class HaServiceControl extends LitElement {
direction: ltr;
}
ha-expansion-panel {
--ha-card-border-radius: 0;
--ha-card-border-radius: var(--ha-border-radius-square);
--expansion-panel-summary-padding: 0 16px;
--expansion-panel-content-padding: 0;
}

View File

@@ -22,7 +22,6 @@ import {
eventOptions,
property,
query,
queryAll,
state,
} from "lit/decorators";
import { classMap } from "lit/directives/class-map";
@@ -41,7 +40,7 @@ import { updateCanInstall } from "../data/update";
import { showEditSidebarDialog } from "../dialogs/sidebar/show-dialog-edit-sidebar";
import { SubscribeMixin } from "../mixins/subscribe-mixin";
import { actionHandler } from "../panels/lovelace/common/directives/action-handler-directive";
import { haStyleAnimations, haStyleScrollbar } from "../resources/styles";
import { haStyleScrollbar } from "../resources/styles";
import type { HomeAssistant, PanelInfo, Route } from "../types";
import "./ha-fade-in";
import "./ha-icon";
@@ -211,8 +210,6 @@ class HaSidebar extends SubscribeMixin(LitElement) {
@query(".tooltip") private _tooltip!: HTMLDivElement;
@queryAll("ha-md-list-item") private _listItems!: NodeListOf<HaMdListItem>;
public hassSubscribe() {
return [
subscribeFrontendUserData(
@@ -325,15 +322,6 @@ class HaSidebar extends SubscribeMixin(LitElement) {
if (changedProps.has("alwaysExpand")) {
toggleAttribute(this, "expanded", this.alwaysExpand);
}
// Staggered animation for list items based on index
this._listItems.forEach((item, index) => {
(item as HTMLElement).style.setProperty(
"--animation-index",
String(index + 1)
);
});
if (!changedProps.has("hass")) {
return;
}
@@ -705,7 +693,6 @@ class HaSidebar extends SubscribeMixin(LitElement) {
static get styles(): CSSResultGroup {
return [
haStyleScrollbar,
haStyleAnimations,
css`
:host {
overflow: visible;
@@ -752,14 +739,6 @@ class HaSidebar extends SubscribeMixin(LitElement) {
}
.menu ha-icon-button {
color: var(--sidebar-icon-color);
animation: fadeInSlideDown var(--ha-animation-duration) ease-out both;
animation-delay: var(--ha-animation-delay-base) / 2;
}
ha-md-list-item {
animation: fadeInSlideDown var(--ha-animation-duration) ease-out both;
animation-delay: calc(
var(--ha-animation-delay-base) * var(--animation-index, 1) / 2
);
}
.title {
margin-left: 3px;
@@ -805,7 +784,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
flex-shrink: 0;
box-sizing: border-box;
margin: 4px;
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
--md-list-item-one-line-container-height: 40px;
--md-list-item-top-space: 0;
--md-list-item-bottom-space: 0;
@@ -828,7 +807,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
--md-ripple-hover-color: var(--sidebar-selected-icon-color);
}
ha-md-list-item.selected::before {
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
position: absolute;
top: 0;
right: 0;
@@ -878,7 +857,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
justify-content: center;
align-items: center;
min-width: 8px;
border-radius: 10px;
border-radius: var(--ha-border-radius-md);
font-weight: var(--ha-font-weight-normal);
line-height: normal;
background-color: var(--accent-color);
@@ -890,7 +869,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {
position: absolute;
top: 4px;
left: 26px;
border-radius: 10px;
border-radius: var(--ha-border-radius-md);
font-size: 0.65em;
line-height: var(--ha-line-height-expanded);
padding: 0 4px;
@@ -923,13 +902,18 @@ class HaSidebar extends SubscribeMixin(LitElement) {
display: none;
position: absolute;
opacity: 0.9;
border-radius: 2px;
border-radius: var(--ha-border-radius-sm);
white-space: nowrap;
color: var(--sidebar-background-color);
background-color: var(--sidebar-text-color);
padding: 4px;
font-weight: var(--ha-font-weight-medium);
}
.menu ha-icon-button {
-webkit-transform: scaleX(var(--scale-direction));
transform: scaleX(var(--scale-direction));
}
`,
];
}

View File

@@ -44,7 +44,10 @@ export class HaSlider extends Slider {
var(--ha-line-height-condensed)
);
--wa-tooltip-padding: 8px;
--wa-tooltip-border-radius: var(--ha-tooltip-border-radius, 4px);
--wa-tooltip-border-radius: var(
--ha-tooltip-border-radius,
var(--ha-border-radius-sm)
);
--wa-tooltip-arrow-size: var(--ha-tooltip-arrow-size, 8px);
--wa-z-index-tooltip: var(--ha-tooltip-z-index, 1000);
min-width: 100px;
@@ -63,13 +66,13 @@ export class HaSlider extends Slider {
}
:host([size="medium"]) {
--thumb-width: var(--ha-font-size-l, 1.25em);
--thumb-height: var(--ha-font-size-l, 1.25em);
--thumb-width: 20px;
--thumb-height: 20px;
}
:host([size="small"]) {
--thumb-width: var(--ha-font-size-m, 1em);
--thumb-height: var(--ha-font-size-m, 1em);
--thumb-width: 16px;
--thumb-height: 16px;
}
`,
];

View File

@@ -112,12 +112,12 @@ export class HaSortable extends LitElement {
.sortable-ghost {
box-shadow: 0 0 0 2px var(--primary-color);
background: rgba(var(--rgb-primary-color), 0.25);
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
opacity: 0.4;
}
.sortable-drag {
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
opacity: 1;
background: var(--card-background-color);
box-shadow: 0px 4px 8px 3px #00000026;

View File

@@ -783,7 +783,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
outline: none;
}
.mdc-chip ha-icon-button ha-svg-icon {
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
background: var(--secondary-text-color);
}
.mdc-chip__icon.mdc-chip__icon--trailing {
@@ -800,7 +800,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) {
align-items: center;
justify-content: center;
--mdc-icon-size: 20px;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
padding: 6px;
margin-left: -13px !important;
margin-inline-start: -13px !important;

View File

@@ -35,7 +35,10 @@ export class HaTooltip extends Tooltip {
var(--ha-line-height-condensed)
);
--wa-tooltip-padding: 8px;
--wa-tooltip-border-radius: var(--ha-tooltip-border-radius, 4px);
--wa-tooltip-border-radius: var(
--ha-tooltip-border-radius,
var(--ha-border-radius-sm)
);
--wa-tooltip-arrow-size: var(--ha-tooltip-arrow-size, 8px);
--wa-z-index-tooltip: var(--ha-tooltip-z-index, 1000);
}

View File

@@ -4,14 +4,14 @@ import type { CSSResultGroup, PropertyValues } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import { fireEvent } from "../common/dom/fire_event";
import type { HomeAssistant } from "../types";
import { haStyle } from "../resources/styles";
import "./ha-code-editor";
import { showToast } from "../util/toast";
import { copyToClipboard } from "../common/util/copy-clipboard";
import type { HaCodeEditor } from "./ha-code-editor";
import "./ha-button";
import { haStyle } from "../resources/styles";
import type { HomeAssistant } from "../types";
import { showToast } from "../util/toast";
import "./ha-alert";
import "./ha-button";
import "./ha-code-editor";
import type { HaCodeEditor } from "./ha-code-editor";
const isEmpty = (obj: Record<string, unknown>): boolean => {
if (typeof obj !== "object" || obj === null) {
@@ -203,8 +203,9 @@ export class HaYamlEditor extends LitElement {
.card-actions {
border-radius: var(
--actions-border-radius,
0px 0px var(--ha-card-border-radius, 12px)
var(--ha-card-border-radius, 12px)
var(--ha-border-radius-square) var(--ha-border-radius-square)
var(--ha-card-border-radius, var(--ha-border-radius-lg))
var(--ha-card-border-radius, var(--ha-border-radius-lg))
);
border: 1px solid var(--divider-color);
padding: 5px 16px;

View File

@@ -7,27 +7,27 @@ import type {
Layer,
Map,
Marker,
Polyline,
MarkerClusterGroup,
Polyline,
} from "leaflet";
import type { PropertyValues } from "lit";
import { css, ReactiveElement } from "lit";
import { customElement, property, state } from "lit/decorators";
import { fireEvent } from "../../common/dom/fire_event";
import { formatDateTime } from "../../common/datetime/format_date_time";
import {
formatTimeWeekday,
formatTimeWithSeconds,
} from "../../common/datetime/format_time";
import { fireEvent } from "../../common/dom/fire_event";
import type { LeafletModuleType } from "../../common/dom/setup-leaflet-map";
import { setupLeafletMap } from "../../common/dom/setup-leaflet-map";
import { computeStateDomain } from "../../common/entity/compute_state_domain";
import { computeStateName } from "../../common/entity/compute_state_name";
import { DecoratedMarker } from "../../common/map/decorated_marker";
import type { HomeAssistant, ThemeMode } from "../../types";
import { isTouch } from "../../util/is_touch";
import "../ha-icon-button";
import "./ha-entity-marker";
import { DecoratedMarker } from "../../common/map/decorated_marker";
declare global {
// for fire event
@@ -710,7 +710,7 @@ export class HaMap extends ReactiveElement {
cursor: move !important;
}
.leaflet-edit-resize {
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
cursor: nesw-resize !important;
}
.named-icon {
@@ -734,7 +734,7 @@ export class HaMap extends ReactiveElement {
font-size: var(--ha-font-size-s);
background: rgba(80, 80, 80, 0.9) !important;
color: white !important;
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
box-shadow: none !important;
text-align: center;
}
@@ -745,7 +745,7 @@ export class HaMap extends ReactiveElement {
border: 3px solid rgba(var(--rgb-primary-color), 0.2);
width: 32px;
height: 32px;
border-radius: 20px;
border-radius: var(--ha-border-radius-2xl);
text-align: center;
color: var(--text-primary-color);
font-size: var(--ha-font-size-m);

View File

@@ -1,7 +1,7 @@
import type { LitVirtualizer } from "@lit-labs/virtualizer";
import { grid } from "@lit-labs/virtualizer/layouts/grid";
import { mdiArrowUpRight, mdiPlay, mdiPlus, mdiKeyboard } from "@mdi/js";
import { mdiArrowUpRight, mdiKeyboard, mdiPlay, mdiPlus } from "@mdi/js";
import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
import { css, html, LitElement, nothing } from "lit";
import {
@@ -56,10 +56,10 @@ import "../ha-list-item";
import "../ha-spinner";
import "../ha-svg-icon";
import "../ha-tooltip";
import "./ha-browse-media-tts";
import "./ha-browse-media-manual";
import type { TtsMediaPickedEvent } from "./ha-browse-media-tts";
import type { ManualMediaPickedEvent } from "./ha-browse-media-manual";
import "./ha-browse-media-tts";
import type { TtsMediaPickedEvent } from "./ha-browse-media-tts";
declare global {
interface HASSDomEvents {
@@ -1174,7 +1174,8 @@ export class HaMediaPlayerBrowse extends LitElement {
}
ha-card .image {
border-radius: 3px 3px 0 0;
border-radius: var(--ha-border-radius-sm) var(--ha-border-radius-sm)
var(--ha-border-radius-square) var(--ha-border-radius-square);
}
.image {
@@ -1216,7 +1217,7 @@ export class HaMediaPlayerBrowse extends LitElement {
.child .play {
position: absolute;
transition: color 0.5s;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
top: calc(50% - 40px);
right: calc(50% - 35px);
opacity: 0;
@@ -1273,7 +1274,7 @@ export class HaMediaPlayerBrowse extends LitElement {
background-size: contain;
background-repeat: no-repeat;
background-position: center;
border-radius: 2px;
border-radius: var(--ha-border-radius-sm);
display: flex;
align-content: center;
align-items: center;
@@ -1284,7 +1285,7 @@ export class HaMediaPlayerBrowse extends LitElement {
opacity: 0;
transition: all 0.5s;
background-color: rgba(var(--rgb-card-background-color), 0.5);
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
--mdc-icon-button-size: 40px;
}
@@ -1344,7 +1345,7 @@ export class HaMediaPlayerBrowse extends LitElement {
margin-bottom: 8px;
position: relative;
background-position: center;
border-radius: 0;
border-radius: var(--ha-border-radius-square);
transition:
width 0.4s,
height 0.4s,

View File

@@ -26,7 +26,7 @@ export class HaTileBadge extends LitElement {
line-height: 0;
width: 16px;
height: 16px;
border-radius: 8px;
border-radius: var(--ha-border-radius-md);
background-color: var(--tile-badge-background-color);
transition: background-color 280ms ease-in-out;
}

View File

@@ -90,7 +90,7 @@ export class HaTimeline extends LitElement {
--timeline-ball-color,
var(--timeline-color, var(--secondary-text-color))
);
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
:host([raised]) ha-svg-icon {
transform: scale(1.3);

View File

@@ -45,7 +45,7 @@ class PersonBadge extends LitElement {
width: 100%;
height: 100%;
background-size: cover;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.initials {
display: inline-flex;
@@ -54,7 +54,7 @@ class PersonBadge extends LitElement {
box-sizing: border-box;
width: 100%;
height: 100%;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
background-color: var(--light-primary-color);
text-decoration: none;
color: var(--text-light-primary-color, var(--primary-text-color));

View File

@@ -92,7 +92,7 @@ class UserBadge extends LitElement {
width: 100%;
height: 100%;
background-size: cover;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.initials {
display: inline-flex;
@@ -101,7 +101,7 @@ class UserBadge extends LitElement {
box-sizing: border-box;
width: 100%;
height: 100%;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
background-color: var(--light-primary-color);
text-decoration: none;
color: var(--text-light-primary-color, var(--primary-text-color));

View File

@@ -9,6 +9,7 @@ import {
startOfDay,
isFirstDayOfMonth,
isLastDayOfMonth,
addYears,
} from "date-fns";
import type { Collection } from "home-assistant-js-websocket";
import { getCollection } from "home-assistant-js-websocket";
@@ -272,6 +273,7 @@ export interface EnergyData {
end?: Date;
startCompare?: Date;
endCompare?: Date;
compareMode?: CompareMode;
prefs: EnergyPreferences;
info: EnergyInfo;
stats: Statistics;
@@ -349,12 +351,18 @@ export const getReferencedStatisticIds = (
return statIDs;
};
export const enum CompareMode {
NONE = "",
PREVIOUS = "previous",
YOY = "yoy",
}
const getEnergyData = async (
hass: HomeAssistant,
prefs: EnergyPreferences,
start: Date,
end?: Date,
compare?: boolean
compare?: CompareMode
): Promise<EnergyData> => {
const info = await getEnergyInfo(hass);
@@ -445,46 +453,50 @@ const getEnergyData = async (
let endCompare;
let _energyStatsCompare: Statistics | Promise<Statistics> = {};
let _waterStatsCompare: Statistics | Promise<Statistics> = {};
if (compare) {
if (
(calcDateProperty(
start,
isFirstDayOfMonth,
hass.locale,
hass.config
) as boolean) &&
(calcDateProperty(
end || new Date(),
isLastDayOfMonth,
hass.locale,
hass.config
) as boolean)
) {
// When comparing a month (or multiple), we want to start at the beginning of the month
startCompare = calcDate(
start,
addMonths,
hass.locale,
hass.config,
-(calcDateDifferenceProperty(
end || new Date(),
if (compare === CompareMode.PREVIOUS) {
if (
(calcDateProperty(
start,
differenceInMonths,
isFirstDayOfMonth,
hass.locale,
hass.config
) as number) - 1
);
} else {
startCompare = calcDate(
start,
addDays,
hass.locale,
hass.config,
(dayDifference + 1) * -1
);
) as boolean) &&
(calcDateProperty(
end || new Date(),
isLastDayOfMonth,
hass.locale,
hass.config
) as boolean)
) {
// When comparing a month (or multiple), we want to start at the beginning of the month
startCompare = calcDate(
start,
addMonths,
hass.locale,
hass.config,
-(calcDateDifferenceProperty(
end || new Date(),
start,
differenceInMonths,
hass.locale,
hass.config
) as number) - 1
);
} else {
startCompare = calcDate(
start,
addDays,
hass.locale,
hass.config,
(dayDifference + 1) * -1
);
}
endCompare = addMilliseconds(start, -1);
} else if (compare === CompareMode.YOY) {
startCompare = calcDate(start, addYears, hass.locale, hass.config, -1);
endCompare = calcDate(end!, addYears, hass.locale, hass.config, -1);
}
endCompare = addMilliseconds(start, -1);
if (energyStatIds.length) {
_energyStatsCompare = fetchStatistics(
hass!,
@@ -559,6 +571,7 @@ const getEnergyData = async (
end,
startCompare,
endCompare,
compareMode: compare,
info,
prefs,
stats,
@@ -577,11 +590,11 @@ const getEnergyData = async (
export interface EnergyCollection extends Collection<EnergyData> {
start: Date;
end?: Date;
compare?: boolean;
compare?: CompareMode;
prefs?: EnergyPreferences;
clearPrefs(): void;
setPeriod(newStart: Date, newEnd?: Date): void;
setCompare(compare: boolean): void;
setCompare(compare: CompareMode): void;
_refreshTimeout?: number;
_updatePeriodTimeout?: number;
_active: number;
@@ -739,7 +752,7 @@ export const getEnergyDataCollection = (
scheduleUpdatePeriod();
}
};
collection.setCompare = (compare: boolean) => {
collection.setCompare = (compare: CompareMode) => {
collection.compare = compare;
};
return collection;

View File

@@ -6,6 +6,7 @@ export enum NumberFormat {
system = "system",
comma_decimal = "comma_decimal",
decimal_comma = "decimal_comma",
quote_decimal = "quote_decimal",
space_comma = "space_comma",
none = "none",
}

View File

@@ -318,7 +318,7 @@ class StepFlowCreateEntry extends LitElement {
.device {
border: 1px solid var(--divider-color);
padding: 6px;
border-radius: 4px;
border-radius: var(--ha-border-radius-sm);
margin: 4px;
display: inline-block;
}

View File

@@ -229,7 +229,7 @@ export class DialogEnterCode
ha-control-button {
width: 56px;
height: 56px;
--control-button-border-radius: 28px;
--control-button-border-radius: var(--ha-border-radius-4xl);
--mdc-icon-size: 24px;
font-size: var(--ha-font-size-2xl);
}

View File

@@ -2,11 +2,11 @@ import Cropper from "cropperjs";
// @ts-ignore
import cropperCss from "cropperjs/dist/cropper.css";
import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
import { css, html, nothing, LitElement, unsafeCSS } from "lit";
import { customElement, property, state, query } from "lit/decorators";
import { css, html, LitElement, nothing, unsafeCSS } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
import "../../components/ha-dialog";
import "../../components/ha-button";
import "../../components/ha-dialog";
import { haStyleDialog } from "../../resources/styles";
import type { HomeAssistant } from "../../types";
import type { HaImageCropperDialogParams } from "./show-image-cropper-dialog";
@@ -150,7 +150,7 @@ export class HaImagecropperDialog extends LitElement {
}
.container.round .cropper-view-box,
.container.round .cropper-face {
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
}
.cropper-line,
.cropper-point,

View File

@@ -281,7 +281,7 @@ class DialogLightColorFavorite extends LitElement {
width: 30px;
height: 30px;
flex: none;
border-radius: 15px;
border-radius: var(--ha-border-radius-xl);
}
.wheel.color {
background-image: url("/static/images/color_wheel.png");

View File

@@ -10,8 +10,8 @@ import {
temperature2rgb,
} from "../../../../common/color/convert-light-color";
import { luminosity } from "../../../../common/color/rgb";
import type { HaOutlinedIconButton } from "../../../../components/ha-outlined-icon-button";
import "../../../../components/ha-outlined-icon-button";
import type { HaOutlinedIconButton } from "../../../../components/ha-outlined-icon-button";
import "../../../../components/ha-svg-icon";
import type { LightColor, LightEntity } from "../../../../data/light";
@@ -106,7 +106,7 @@ class MoreInfoViewLightColorPicker extends LitElement {
--md-ripple-focus-color: 0;
--md-ripple-hover-opacity: 0;
--md-ripple-pressed-opacity: 0;
border-radius: 9999px;
border-radius: var(--ha-border-radius-pill);
}
:host([disabled]) {
pointer-events: none;

View File

@@ -316,7 +316,7 @@ export class HaMoreInfoLightFavoriteColors extends LitElement {
outline: none;
background-color: var(--secondary-background-color);
padding: 0;
border-radius: 10px;
border-radius: var(--ha-border-radius-md);
border: none;
cursor: pointer;
display: block;

View File

@@ -14,10 +14,10 @@ import { stateColorCss } from "../../../../common/entity/state_color";
import { throttle } from "../../../../common/util/throttle";
import "../../../../components/ha-control-slider";
import { UNAVAILABLE } from "../../../../data/entity";
import { DOMAIN_ATTRIBUTES_UNITS } from "../../../../data/entity_attributes";
import type { LightColor, LightEntity } from "../../../../data/light";
import { LightColorMode } from "../../../../data/light";
import type { HomeAssistant } from "../../../../types";
import { DOMAIN_ATTRIBUTES_UNITS } from "../../../../data/entity_attributes";
declare global {
interface HASSDomEvents {
@@ -179,7 +179,7 @@ class LightColorTempPicker extends LitElement {
max-height: 320px;
min-height: 200px;
--control-slider-thickness: 130px;
--control-slider-border-radius: 36px;
--control-slider-border-radius: var(--ha-border-radius-6xl);
--control-slider-color: var(--primary-color);
--control-slider-background: -webkit-linear-gradient(
top,

View File

@@ -1,26 +1,26 @@
import { mdiClose, mdiPlay, mdiStop } from "@mdi/js";
import type { HassEntity } from "home-assistant-js-websocket";
import type { CSSResultGroup } from "lit";
import { css, html, LitElement, nothing } from "lit";
import { customElement, property, query, state } from "lit/decorators";
import type { HassEntity } from "home-assistant-js-websocket";
import { mdiClose, mdiPlay, mdiStop } from "@mdi/js";
import type { HomeAssistant } from "../../../../types";
import { fireEvent } from "../../../../common/dom/fire_event";
import { stopPropagation } from "../../../../common/dom/stop_propagation";
import { supportsFeature } from "../../../../common/entity/supports-feature";
import "../../../../components/ha-button";
import "../../../../components/ha-control-button";
import "../../../../components/ha-dialog-header";
import "../../../../components/ha-icon-button";
import "../../../../components/ha-list-item";
import type { HaMdDialog } from "../../../../components/ha-md-dialog";
import {
getMobileCloseToBottomAnimation,
getMobileOpenFromBottomAnimation,
} from "../../../../components/ha-md-dialog";
import "../../../../components/ha-dialog-header";
import "../../../../components/ha-icon-button";
import "../../../../components/ha-button";
import "../../../../components/ha-textfield";
import "../../../../components/ha-control-button";
import "../../../../components/ha-select";
import "../../../../components/ha-list-item";
import type { HaMdDialog } from "../../../../components/ha-md-dialog";
import { fireEvent } from "../../../../common/dom/fire_event";
import { supportsFeature } from "../../../../common/entity/supports-feature";
import "../../../../components/ha-textfield";
import { SirenEntityFeature } from "../../../../data/siren";
import { haStyle } from "../../../../resources/styles";
import type { HomeAssistant } from "../../../../types";
@customElement("ha-more-info-siren-advanced-controls")
class MoreInfoSirenAdvancedControls extends LitElement {
@@ -212,7 +212,7 @@ class MoreInfoSirenAdvancedControls extends LitElement {
margin-top: 16px;
}
ha-control-button {
--control-button-border-radius: 16px;
--control-button-border-radius: var(--ha-border-radius-xl);
--mdc-icon-size: 24px;
width: 64px;
height: 64px;

View File

@@ -99,7 +99,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
--mdc-icon-size: 80px;
animation: pulse 1s infinite;
color: var(--icon-color);
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
width: 144px;
height: 144px;
display: flex;
@@ -113,7 +113,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
left: 0;
height: 100%;
width: 100%;
border-radius: 50%;
border-radius: var(--ha-border-radius-circle);
background-color: var(--icon-color);
transition: background-color 180ms ease-in-out;
opacity: 0.2;
@@ -123,7 +123,7 @@ class MoreInfoAlarmControlPanel extends LitElement {
min-width: 130px;
max-width: 200px;
margin: 0 auto;
--control-button-border-radius: 24px;
--control-button-border-radius: var(--ha-border-radius-3xl);
}
`,
];

View File

@@ -344,7 +344,7 @@ class MoreInfoLight extends LitElement {
flex-direction: row;
align-items: center;
height: 48px;
border-radius: 24px;
border-radius: var(--ha-border-radius-3xl);
background-color: rgba(139, 145, 151, 0.1);
box-sizing: border-box;
width: auto;
@@ -353,7 +353,7 @@ class MoreInfoLight extends LitElement {
width: 30px;
height: 30px;
flex: none;
border-radius: 15px;
border-radius: var(--ha-border-radius-xl);
}
.wheel.color {
background-image: url("/static/images/color_wheel.png");

Some files were not shown because too many files have changed in this diff Show More