mirror of
https://github.com/home-assistant/frontend.git
synced 2025-07-25 18:26:35 +00:00
Fix lovelace background, tweak headers (#15977)
This commit is contained in:
parent
e52b2c49a6
commit
ef10cc77f7
@ -41,7 +41,9 @@ export class HaDialog extends DialogBase {
|
|||||||
SUPPRESS_DEFAULT_PRESS_SELECTOR,
|
SUPPRESS_DEFAULT_PRESS_SELECTOR,
|
||||||
].join(", ");
|
].join(", ");
|
||||||
this._updateScrolledAttribute();
|
this._updateScrolledAttribute();
|
||||||
this.contentElement?.addEventListener("scroll", this._onScroll);
|
this.contentElement?.addEventListener("scroll", this._onScroll, {
|
||||||
|
passive: true,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
disconnectedCallback(): void {
|
disconnectedCallback(): void {
|
||||||
|
@ -323,7 +323,7 @@ export class HaTabsSubpageDataTable extends LitElement {
|
|||||||
--text-field-overflow: initial;
|
--text-field-overflow: initial;
|
||||||
display: flex;
|
display: flex;
|
||||||
justify-content: flex-end;
|
justify-content: flex-end;
|
||||||
margin-right: 8px;
|
margin-right: -8px;
|
||||||
color: var(--primary-text-color);
|
color: var(--primary-text-color);
|
||||||
}
|
}
|
||||||
.active-filters {
|
.active-filters {
|
||||||
|
@ -376,7 +376,7 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
|
|||||||
);
|
);
|
||||||
|
|
||||||
const filterMenu = html`
|
const filterMenu = html`
|
||||||
<div slot=${ifDefined(this.narrow ? "toolbar-icon" : "suffix")}>
|
<div slot=${ifDefined(this.narrow ? "toolbar-icon" : undefined)}>
|
||||||
<div class="menu-badge-container">
|
<div class="menu-badge-container">
|
||||||
${!this._showDisabled && this.narrow && disabledCount
|
${!this._showDisabled && this.narrow && disabledCount
|
||||||
? html`<span class="badge">${disabledCount}</span>`
|
? html`<span class="badge">${disabledCount}</span>`
|
||||||
@ -455,24 +455,25 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
|
|||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
${!this._showDisabled && disabledCount
|
${!this._showDisabled && disabledCount
|
||||||
? html`<div
|
? html`<div class="filters" slot="suffix">
|
||||||
class="active-filters"
|
<div
|
||||||
slot="suffix"
|
class="active-filters"
|
||||||
@click=${this._preventDefault}
|
@click=${this._preventDefault}
|
||||||
>
|
>
|
||||||
${this.hass.localize(
|
${this.hass.localize(
|
||||||
"ui.panel.config.integrations.disable.disabled_integrations",
|
"ui.panel.config.integrations.disable.disabled_integrations",
|
||||||
{ number: disabledCount }
|
{ number: disabledCount }
|
||||||
)}
|
|
||||||
<mwc-button
|
|
||||||
@click=${this._toggleShowDisabled}
|
|
||||||
.label=${this.hass.localize(
|
|
||||||
"ui.panel.config.integrations.disable.show"
|
|
||||||
)}
|
)}
|
||||||
></mwc-button>
|
<mwc-button
|
||||||
|
@click=${this._toggleShowDisabled}
|
||||||
|
.label=${this.hass.localize(
|
||||||
|
"ui.panel.config.integrations.disable.show"
|
||||||
|
)}
|
||||||
|
></mwc-button>
|
||||||
|
</div>
|
||||||
|
${filterMenu}
|
||||||
</div>`
|
</div>`
|
||||||
: ""}
|
: ""}
|
||||||
${filterMenu}
|
|
||||||
</search-input>
|
</search-input>
|
||||||
</div>
|
</div>
|
||||||
`}
|
`}
|
||||||
@ -845,7 +846,6 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
|
|||||||
.container > * {
|
.container > * {
|
||||||
max-width: 500px;
|
max-width: 500px;
|
||||||
}
|
}
|
||||||
|
|
||||||
.empty-message {
|
.empty-message {
|
||||||
margin: auto;
|
margin: auto;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
@ -884,6 +884,16 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) {
|
|||||||
right: 0;
|
right: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
}
|
}
|
||||||
|
.filters {
|
||||||
|
--mdc-text-field-fill-color: var(--input-fill-color);
|
||||||
|
--mdc-text-field-idle-line-color: var(--input-idle-line-color);
|
||||||
|
--mdc-shape-small: 4px;
|
||||||
|
--text-field-overflow: initial;
|
||||||
|
display: flex;
|
||||||
|
justify-content: flex-end;
|
||||||
|
margin-right: -8px;
|
||||||
|
color: var(--primary-text-color);
|
||||||
|
}
|
||||||
.active-filters {
|
.active-filters {
|
||||||
color: var(--primary-text-color);
|
color: var(--primary-text-color);
|
||||||
position: relative;
|
position: relative;
|
||||||
|
@ -26,7 +26,13 @@ import {
|
|||||||
PropertyValues,
|
PropertyValues,
|
||||||
TemplateResult,
|
TemplateResult,
|
||||||
} from "lit";
|
} from "lit";
|
||||||
import { customElement, property, query, state } from "lit/decorators";
|
import {
|
||||||
|
customElement,
|
||||||
|
eventOptions,
|
||||||
|
property,
|
||||||
|
query,
|
||||||
|
state,
|
||||||
|
} from "lit/decorators";
|
||||||
import { classMap } from "lit/directives/class-map";
|
import { classMap } from "lit/directives/class-map";
|
||||||
import { ifDefined } from "lit/directives/if-defined";
|
import { ifDefined } from "lit/directives/if-defined";
|
||||||
import memoizeOne from "memoize-one";
|
import memoizeOne from "memoize-one";
|
||||||
@ -116,9 +122,9 @@ class HUIRoot extends LitElement {
|
|||||||
|
|
||||||
return html`
|
return html`
|
||||||
<div
|
<div
|
||||||
class=" ${classMap({
|
class=${classMap({
|
||||||
"edit-mode": this._editMode,
|
"edit-mode": this._editMode,
|
||||||
})}"
|
})}
|
||||||
>
|
>
|
||||||
<div class="header">
|
<div class="header">
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
@ -547,11 +553,20 @@ class HUIRoot extends LitElement {
|
|||||||
`
|
`
|
||||||
: ""}
|
: ""}
|
||||||
</div>
|
</div>
|
||||||
<div id="view" @ll-rebuild=${this._debouncedConfigChanged}></div>
|
<div
|
||||||
|
id="view"
|
||||||
|
@ll-rebuild=${this._debouncedConfigChanged}
|
||||||
|
@scroll=${this._viewScrolled}
|
||||||
|
></div>
|
||||||
</div>
|
</div>
|
||||||
`;
|
`;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@eventOptions({ passive: true })
|
||||||
|
private _viewScrolled(ev) {
|
||||||
|
this.toggleAttribute("scrolled", ev.currentTarget.scrollTop !== 0);
|
||||||
|
}
|
||||||
|
|
||||||
private _isVisible = (view: LovelaceViewConfig) =>
|
private _isVisible = (view: LovelaceViewConfig) =>
|
||||||
Boolean(
|
Boolean(
|
||||||
this._editMode ||
|
this._editMode ||
|
||||||
@ -947,6 +962,10 @@ class HUIRoot extends LitElement {
|
|||||||
top: 0;
|
top: 0;
|
||||||
width: var(--mdc-top-app-bar-width, 100%);
|
width: var(--mdc-top-app-bar-width, 100%);
|
||||||
z-index: 2;
|
z-index: 2;
|
||||||
|
transition: box-shadow 0.3s ease-out;
|
||||||
|
}
|
||||||
|
:host([scrolled]) .header {
|
||||||
|
box-shadow: 0px 0px 8px 0px rgba(0, 0, 0, 0.75);
|
||||||
}
|
}
|
||||||
.edit-mode .header {
|
.edit-mode .header {
|
||||||
background-color: var(--app-header-edit-background-color, #455a64);
|
background-color: var(--app-header-edit-background-color, #455a64);
|
||||||
@ -1025,14 +1044,10 @@ class HUIRoot extends LitElement {
|
|||||||
100vh - var(--header-height) - env(safe-area-inset-top) -
|
100vh - var(--header-height) - env(safe-area-inset-top) -
|
||||||
env(safe-area-inset-bottom)
|
env(safe-area-inset-bottom)
|
||||||
);
|
);
|
||||||
/**
|
background: var(
|
||||||
* Since we only set min-height, if child nodes need percentage
|
--lovelace-background,
|
||||||
* heights they must use absolute positioning so we need relative
|
var(--primary-background-color)
|
||||||
* positioning here.
|
);
|
||||||
*
|
|
||||||
* https://www.w3.org/TR/CSS2/visudet.html#the-height-property
|
|
||||||
*/
|
|
||||||
position: relative;
|
|
||||||
display: flex;
|
display: flex;
|
||||||
overflow: auto;
|
overflow: auto;
|
||||||
}
|
}
|
||||||
@ -1064,12 +1079,6 @@ class HUIRoot extends LitElement {
|
|||||||
.menu-link {
|
.menu-link {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
}
|
}
|
||||||
hui-view {
|
|
||||||
background: var(
|
|
||||||
--lovelace-background,
|
|
||||||
var(--primary-background-color)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
.exit-edit-mode {
|
.exit-edit-mode {
|
||||||
--mdc-theme-primary: var(--app-header-edit-text-color, #fff);
|
--mdc-theme-primary: var(--app-header-edit-text-color, #fff);
|
||||||
--mdc-button-outline-color: var(--app-header-edit-text-color, #fff);
|
--mdc-button-outline-color: var(--app-header-edit-text-color, #fff);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user