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

Fixes: #1902 - Thermostat/Light Background #1931

Merged
merged 2 commits into from
Oct 31, 2018
Merged

Fixes: #1902 - Thermostat/Light Background #1931

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4ce6fe1
Thermostat theme fixes
zsarnett Oct 30, 2018
27a1ccd
Might as well put the light card in there
zsarnett Oct 31, 2018
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
33 changes: 21 additions & 12 deletions src/panels/lovelace/cards/hui-light-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,15 @@ export class HuiLightCard extends hassLocalizeLitMixin(LitElement)
ha-card {
position: relative;
overflow: hidden;
--brightness-font-color: white;
--brightness-font-text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
--name-font-size: 1.2rem;
--brightness-font-size: 1.2rem;
--rail-border-color: transparent;
}
#tooltip {
position: absolute;
Expand Down Expand Up @@ -183,12 +192,12 @@ export class HuiLightCard extends hassLocalizeLitMixin(LitElement)
background-color: var(--primary-color);
}
#light .rs-path-color {
background-color: #d6d6d6;
background-color: var(--disabled-text-color);
}
#light .rs-handle {
background-color: #FFF;
background-color: var(--paper-card-background-color, white);
padding: 7px;
border: 2px solid #d6d6d6;
border: 2px solid var(--disabled-text-color);
}
#light .rs-handle.rs-focus {
border-color:var(--primary-color);
Expand All @@ -198,7 +207,11 @@ export class HuiLightCard extends hassLocalizeLitMixin(LitElement)
background-color: var(--primary-color);
}
#light .rs-border {
border-color: transparent;
border-color: var(--rail-border-color);
}
#light .rs-inner.rs-bg-color.rs-border,
#light .rs-overlay.rs-transition.rs-bg-color {
background-color: var(--paper-card-background-color, white);
}
ha-icon {
margin: auto;
Expand All @@ -215,10 +228,10 @@ export class HuiLightCard extends hassLocalizeLitMixin(LitElement)
}
.name {
padding-top: 40px;
font-size: 1.2rem;
font-size: var(--name-font-size);
}
.brightness {
font-size: 1.2rem;
font-size: var(--brightness-font-size);
position: absolute;
margin: 0 auto;
left: 50%;
Expand All @@ -229,12 +242,8 @@ export class HuiLightCard extends hassLocalizeLitMixin(LitElement)
-moz-transition: opacity .5s ease-in-out;
-webkit-transition: opacity .5s ease-in-out;
cursor: pointer;
color: white;
text-shadow:
-1px -1px 0 #000,
1px -1px 0 #000,
-1px 1px 0 #000,
1px 1px 0 #000;
color: var(--brightness-font-color);
text-shadow: var(--brightness-font-text-shadow)
}
.show_brightness {
opacity: 1;
Expand Down
29 changes: 20 additions & 9 deletions src/panels/lovelace/cards/hui-thermostat-card.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,25 +173,31 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
}
ha-card {
overflow: hidden;
--rail-border-color: transparent;
--auto-color: green;
--cool-color: #2b9af9;
--heat-color: #FF8100;
--off-color: #8a8a8a;
--unknown-color: #bac;
}
#root {
position: relative;
overflow: hidden;
}
.auto {
--mode-color: green;
--mode-color: var(--auto-color);
}
.cool {
--mode-color: #2b9af9;
--mode-color: var(--cool-color);
}
.heat {
--mode-color: #FF8100;
--mode-color: var(--heat-color);
}
.off {
--mode-color: #8a8a8a;
--mode-color: var(--off-color);
}
.unknown-mode {
--mode-color: #bac;
--mode-color: var(--unknown-color);
}
.no-title {
--title-margin-top: 33% !important;
Expand Down Expand Up @@ -236,12 +242,12 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
background-color: var(--mode-color, var(--disabled-text-color));
}
#thermostat .rs-path-color {
background-color: #d6d6d6;
background-color: var(--disabled-text-color);
}
#thermostat .rs-handle {
background-color: #FFF;
background-color: var(--paper-card-background-color, white);
padding: 7px;
border: 2px solid #d6d6d6;
border: 2px solid var(--disabled-text-color);
}
#thermostat .rs-handle.rs-focus {
border-color: var(--mode-color, var(--disabled-text-color));
Expand All @@ -251,11 +257,15 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
background-color: var(--mode-color, var(--disabled-text-color));
}
#thermostat .rs-border {
border-color: transparent;
border-color: var(--rail-border-color);
}
#thermostat .rs-bar.rs-transition.rs-first, .rs-bar.rs-transition.rs-second{
z-index: 20 !important;
}
#thermostat .rs-inner.rs-bg-color.rs-border,
#thermostat .rs-overlay.rs-transition.rs-bg-color {
background-color: var(--paper-card-background-color, white);
}
#tooltip {
position: absolute;
top: 0;
Expand All @@ -264,6 +274,7 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement)
height: 100%;
text-align: center;
z-index: 15;
color: var(--primary-text-color);
}
#set-temperature {
font-size: var(--set-temperature-font-size);
Expand Down