Skip to content

Style tweaks #4766

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
balloob merged 3 commits into from
Feb 8, 2020
Merged

Style tweaks #4766

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4d6724
Style tweaks
bramkragten Feb 5, 2020
0690d0d
Update ha-style.ts
bramkragten Feb 5, 2020
1035d50
Move derived styles
bramkragten Feb 7, 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
4 changes: 0 additions & 4 deletions src/panels/developer-tools/mqtt/developer-tools-mqtt.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,10 +120,6 @@ class HaPanelDevMqtt extends LitElement {
direction: ltr;
}

mwc-button {
background-color: white;
}

mqtt-subscribe-card {
display: block;
margin: 16px auto;
Expand Down
4 changes: 2 additions & 2 deletions src/resources/ha-style.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ documentContainer.innerHTML = `<custom-style>
--secondary-background-color: #e5e5e5; /* behind the cards on state */

/* sidebar menu */
--sidebar-icon-color: rgba(0, 0, 0, 0.5);
--sidebar-icon-color: rgba(var(--rgb-primary-text-color), 0.6);

/* for label-badge */
--label-badge-background-color: white;
--label-badge-text-color: rgb(76, 76, 76);
--label-badge-text-color: rgba(var(--rgb-primary-text-color), 0.8);

@balloob balloob Feb 5, 2020

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should this be added to derivedStyles?

--label-badge-red: #DF4C1E;
--label-badge-blue: #039be5;
--label-badge-green: #0DA035;
Expand Down
11 changes: 7 additions & 4 deletions src/resources/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,16 @@ export const derivedStyles = {
"sidebar-selected-icon-color": "var(--primary-color)",
"switch-checked-color": "var(--primary-color)",
"switch-checked-button-color":
"var(--switch-checked-color, var(--paper-grey-50))",
"var(--switch-checked-color, var(--primary-background-color))",
"switch-checked-track-color": "var(--switch-checked-color, #000000)",
"switch-unchecked-button-color":
"var(--switch-unchecked-color, var(--paper-grey-50))",
"var(--switch-unchecked-color, var(--primary-background-color))",
"switch-unchecked-track-color": "var(--switch-unchecked-color, #000000)",
"slider-color": "var(--primary-color)",
"slider-secondary-color": "var(--light-primary-color)",
"slider-bar-color": "var(--disabled-text-color)",
"label-badge-grey": "var(--paper-grey-500)",
"label-badge-background-color": "var(--card-background-color)",
"paper-card-background-color": "var(--card-background-color)",
"paper-listbox-background-color": "var(--card-background-color)",
"paper-item-icon-color": "var(--state-icon-color)",
Expand All @@ -35,13 +36,15 @@ export const derivedStyles = {
"mdc-theme-primary": "var(--primary-color)",
"mdc-theme-secondary": "var(--accent-color)",
"mdc-theme-background": "var(--primary-background-color)",
"mdc-theme-surface":
"var(--paper-card-background-color, var(--card-background-color))",
"mdc-theme-surface": "var(--card-background-color)",
"mdc-theme-on-primary": "var(--text-primary-color)",
"mdc-theme-on-secondary": "var(--text-primary-color)",
"mdc-theme-on-surface": "var(--primary-text-color)",
"app-header-text-color": "var(--text-primary-color)",
"app-header-background-color": "var(--primary-color)",
"material-body-text-color": "var(--primary-text-color)",
"material-background-color": "var(--card-background-color)",
"material-secondary-background-color": "var(--secondary-background-color)",
};

export const haStyle = css`
Expand Down