Skip to content

Cleanup more info styling #7004

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

Merged
bramkragten merged 2 commits into from
Sep 14, 2020
Merged

Cleanup more info styling #7004

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab781b0
Cleanup more info styling
bramkragten Sep 14, 2020
4c51f2b
Update src/dialogs/more-info/ha-more-info-dialog.ts
bramkragten Sep 14, 2020
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
5 changes: 4 additions & 1 deletion src/dialogs/more-info/controls/more-info-person.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class MoreInfoPerson extends LitElement {
return html`
<ha-attributes
.stateObj=${this.stateObj}
extraFilters="id,user_id,editable"
extra-filters="id,user_id,editable"
></ha-attributes>
${this.stateObj.attributes.latitude && this.stateObj.attributes.longitude
? html`
Expand Down Expand Up @@ -78,6 +78,9 @@ class MoreInfoPerson extends LitElement {
margin: 36px 0 8px 0;
text-align: right;
}
ha-map {
margin-top: 16px;
}
`;
}
}
Expand Down
7 changes: 4 additions & 3 deletions src/dialogs/more-info/ha-more-info-dialog.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ import { navigate } from "../../common/navigate";
import "../../components/ha-dialog";
import "../../components/ha-header-bar";
import "../../components/ha-svg-icon";
import "../../components/state-history-charts";
import { removeEntityRegistryEntry } from "../../data/entity_registry";
import { showEntityEditorDialog } from "../../panels/config/entities/show-dialog-entity-editor";
import "../../panels/logbook/ha-logbook";
import { haStyleDialog } from "../../resources/styles";
import "../../state-summary/state-card-content";
import { HomeAssistant } from "../../types";
Expand Down Expand Up @@ -220,6 +218,7 @@ export class MoreInfoDialog extends LitElement {
.entityId=${this._entityId}
></ha-more-info-history>
<ha-more-info-logbook
class="padding-bottom"
Comment thread
bramkragten marked this conversation as resolved.
Outdated
Comment thread
bramkragten marked this conversation as resolved.
Outdated
.hass=${this.hass}
.entityId=${this._entityId}
></ha-more-info-logbook>`}
Expand Down Expand Up @@ -394,7 +393,9 @@ export class MoreInfoDialog extends LitElement {
--dialog-content-padding: 0;
}

state-card-content {
state-card-content,
ha-more-info-history,
ha-more-info-logbook:not(:last-child) {
display: block;
margin-bottom: 16px;
}
Expand Down
14 changes: 0 additions & 14 deletions src/dialogs/more-info/ha-more-info-history.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import {
css,
customElement,
html,
internalProperty,
Expand All @@ -13,7 +12,6 @@ import { throttle } from "../../common/util/throttle";
import "../../components/state-history-charts";
import { getRecentWithCache } from "../../data/cached-history";
import { HistoryResult } from "../../data/history";
import { haStyle } from "../../resources/styles";
import { HomeAssistant } from "../../types";

@customElement("ha-more-info-history")
Expand Down Expand Up @@ -88,18 +86,6 @@ export class MoreInfoHistory extends LitElement {
this.hass!.language
);
}

static get styles() {
return [
haStyle,
css`
state-history-charts {
display: block;
margin-bottom: 16px;
}
`,
];
}
}

declare global {
Expand Down
2 changes: 0 additions & 2 deletions src/dialogs/more-info/ha-more-info-logbook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,6 @@ export class MoreInfoLogbook extends LitElement {
ha-logbook {
max-height: 250px;
overflow: auto;
display: block;
margin-top: 16px;
}
ha-circular-progress {
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/panels/logbook/ha-logbook.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@ class HaLogbook extends LitElement {
.narrow .entry {
flex-direction: column;
line-height: 1.5;
padding: 8px;
padding: 8px 0;
}

.narrow .icon-message ha-icon {
Expand Down