Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix visual differences between regular and energy dashboards #20654

Merged
merged 5 commits into from
Apr 30, 2024
Merged

Fix visual differences between regular and energy dashboards #20654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
737484d
Fix visual differences between regular and energy dashboards
Nezz Apr 28, 2024
8fef80d
Order padding properties the same way between energy and lovelace
Nezz Apr 28, 2024
d91df52
Merge branch 'dev' into fix/DashboardBackground
Nezz Apr 28, 2024
347482a
Change from code review
Nezz Apr 30, 2024
684c021
Merge branch 'dev' into fix/DashboardBackground
Nezz Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/panels/energy/ha-panel-energy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,14 +112,14 @@ class PanelEnergy extends LitElement {
</hui-energy-period-selector>
</div>
</div>
<hui-view
id="view"
.hass=${this.hass}
.narrow=${this.narrow}
.lovelace=${this._lovelace}
.index=${this._viewIndex}
@reload-energy-panel=${this._reloadView}
></hui-view>
<div id="view" @reload-energy-panel=${this._reloadView}>
<hui-view
.hass=${this.hass}
.narrow=${this.narrow}
.lovelace=${this._lovelace}
.index=${this._viewIndex}
></hui-view>
</div>
`;
}

Expand Down Expand Up @@ -401,12 +401,10 @@ class PanelEnergy extends LitElement {
min-height: 100vh;
box-sizing: border-box;
padding-left: env(safe-area-inset-left);
padding-inline-start: env(safe-area-inset-left);
padding-right: env(safe-area-inset-right);
padding-inline-start: env(safe-area-inset-left);
padding-inline-end: env(safe-area-inset-right);
padding-bottom: env(safe-area-inset-bottom);
}
hui-view {
background: var(
--lovelace-background,
var(--primary-background-color)
Expand Down
2 changes: 0 additions & 2 deletions src/panels/lovelace/hui-root.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1013,8 +1013,6 @@ class HUIRoot extends LitElement {
padding-inline-start: env(safe-area-inset-left);
padding-inline-end: env(safe-area-inset-right);
padding-bottom: env(safe-area-inset-bottom);
}
hui-view {
Comment on lines -1016 to -1017
Copy link
Member

@bramkragten bramkragten May 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be reverted I think.

The issue is that the background can be set with a theme variable --lovelace-background that can set on the view or with a config variable in YAML. Putting the background option a level higher means that the view theme can not set the background of the view, because it can not target anything above itself.

You can set the background on both #view and hui-view, but that will not give the best experience either when using something different than a solid color.

Copy link
Member

@bramkragten bramkragten May 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or, a bit ugly... #20683

background: var(
--lovelace-background,
var(--primary-background-color)
Expand Down
Loading