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

Updated design for integration icons #22393

Merged
merged 5 commits into from
Oct 16, 2024
Merged

Updated design for integration icons #22393

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
ef1fb9b
Show if a custom integration overwrites a core integration
MindFreeze Oct 9, 2024
5319919
use 1 icon and change tooltip and color
MindFreeze Oct 14, 2024
b76e5a4
Updated design for integration icons
MindFreeze Oct 15, 2024
bf6d334
add color for `overwrites_built_in`
MindFreeze Oct 15, 2024
63f4a3f
fix merge mistake
MindFreeze Oct 16, 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
21 changes: 7 additions & 14 deletions src/panels/config/integrations/ha-integration-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import "@lrnwebcomponents/simple-tooltip/simple-tooltip";
import { mdiCloud, mdiFileCodeOutline, mdiPackageVariant } from "@mdi/js";
import { mdiFileCodeOutline, mdiPackageVariant, mdiWeb } from "@mdi/js";
import {
CSSResultGroup,
LitElement,
Expand Down Expand Up @@ -181,7 +181,7 @@ export class HaIntegrationCard extends LitElement {
: nothing}
${this.manifest && this.manifest.iot_class?.startsWith("cloud_")
? html`<div class="icon cloud">
<ha-svg-icon .path=${mdiCloud}></ha-svg-icon>
<ha-svg-icon .path=${mdiWeb}></ha-svg-icon>
<simple-tooltip
animation-delay="0"
.position=${computeRTL(this.hass) ? "right" : "left"}
Expand Down Expand Up @@ -354,28 +354,21 @@ export class HaIntegrationCard extends LitElement {
display: flex;
}
.icon {
border-radius: 50%;
color: var(--text-primary-color);
color: var(--label-badge-grey);
padding: 4px;
margin-left: 8px;
margin-inline-start: 8px;
margin-inline-end: initial;
}
.icon.cloud {
background: var(--info-color);
}
.icon.custom {
background: var(--warning-color);
color: var(--warning-color);
}
.icon.overwrites {
background: var(--error-color);
}
.icon.yaml {
background: var(--label-badge-grey);
color: var(--error-color);
}
.icon ha-svg-icon {
width: 16px;
height: 16px;
width: 24px;
height: 24px;
display: block;
}
simple-tooltip {
Expand Down
15 changes: 12 additions & 3 deletions src/panels/config/integrations/ha-integration-list-item.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import {
ListItemBase,
} from "@material/mwc-list/mwc-list-item-base";
import { styles } from "@material/mwc-list/mwc-list-item.css";
import { mdiCloudOutline, mdiOpenInNew, mdiPackageVariant } from "@mdi/js";
import { mdiFileCodeOutline, mdiPackageVariant, mdiWeb } from "@mdi/js";
import { css, CSSResultGroup, html, nothing } from "lit";
import { customElement, property } from "lit/decorators";
import { classMap } from "lit/directives/class-map";
Expand Down Expand Up @@ -72,7 +72,7 @@ export class HaIntegrationListItem extends ListItemBase {
return html`<span class="mdc-deprecated-list-item__meta material-icons">
${this.integration.cloud
? html`<span
><ha-svg-icon .path=${mdiCloudOutline}></ha-svg-icon
><ha-svg-icon .path=${mdiWeb}></ha-svg-icon
><simple-tooltip animation-delay="0" position="left"
>${this.hass.localize(
"ui.panel.config.integrations.config_entry.depends_on_cloud"
Expand All @@ -82,6 +82,9 @@ export class HaIntegrationListItem extends ListItemBase {
: ""}
${!this.integration.is_built_in
? html`<span
class=${this.integration.overwrites_built_in
? "overwrites"
: "custom"}
><ha-svg-icon .path=${mdiPackageVariant}></ha-svg-icon
><simple-tooltip animation-delay="0" position="left"
>${this.hass.localize(
Expand All @@ -101,7 +104,7 @@ export class HaIntegrationListItem extends ListItemBase {
"ui.panel.config.integrations.config_entry.yaml_only"
)}</simple-tooltip
><ha-svg-icon
.path=${mdiOpenInNew}
.path=${mdiFileCodeOutline}
class="open-in-new"
></ha-svg-icon
></span>`
Expand Down Expand Up @@ -161,6 +164,12 @@ export class HaIntegrationListItem extends ListItemBase {
--mdc-icon-size: 22px;
padding: 1px;
}
.custom {
color: var(--warning-color);
}
.overwrites {
color: var(--error-color);
}
`,
];
}
Expand Down
4 changes: 2 additions & 2 deletions src/translations/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4405,8 +4405,8 @@
},
"custom_integration": "Custom integration",
"custom_overwrites_core": "Custom integration that replaces a core component",
"depends_on_cloud": "Depends on the cloud",
"yaml_only": "Needs manual configuration",
"depends_on_cloud": "Depends on Internet connection",
"yaml_only": "This integration cannot be setup from the UI",
"no_config_flow": "This integration was not set up from the UI",
"disabled_polling": "Automatic polling for updated data disabled",
"debug_logging_enabled": "Debug logging enabled",
Expand Down
Loading