Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
638ed8e
Update partial-cards.html
Jul 27, 2017
e70fb79
Update ha-card.html
Jul 27, 2017
31db2f7
Update ha-card.html
Jul 27, 2017
da07027
Update ha-style.html
Jul 27, 2017
cfdc50c
Update partial-cards.html
Jul 27, 2017
839452b
Update ha-sidebar.html
Jul 27, 2017
627fd70
Update ha-panel-dev-service.html
Jul 27, 2017
33ef1bd
Update ha-media_player-card.html
Jul 27, 2017
8f66fba
Update ha-media_player-card.html
Jul 27, 2017
a6dba03
Update partial-cards.html
Jul 28, 2017
904b165
Update ha-style.html
Jul 28, 2017
6c35109
Update ha-style.html
Jul 28, 2017
e5244db
Update ha-state-label-badge.html
Jul 28, 2017
78042da
Update ha-style.html
Jul 28, 2017
cad0ec5
Update ha-panel-dev-service.html
Jul 29, 2017
61e07e5
Update ha-media_player-card.html
Jul 29, 2017
827c898
Update ha-state-label-badge.html
Jul 29, 2017
0c25c50
Update ha-card.html
Jul 29, 2017
194834a
Update ha-style.html
Jul 29, 2017
de76a58
Update ha-style.html
Jul 29, 2017
cd1ca02
Update partial-cards.html
Jul 29, 2017
1ddd61a
Update ha-style.html
Jul 29, 2017
d6df3ed
Update ha-style.html
Jul 29, 2017
aea40a4
Update ha-panel-dev-service.html
Jul 29, 2017
9d1111f
Update ha-panel-dev-state.html
Jul 29, 2017
9d63f72
Update state-badge.html
Jul 29, 2017
2c83fd0
Update ha-label-badge.html
Jul 29, 2017
af54766
Update home-assistant-main.html
Jul 29, 2017
8ac25ff
Update ha-style.html
Jul 29, 2017
52bd49d
Update ha-label-badge.html
Jul 29, 2017
e25eaeb
Update ha-label-badge.html
Jul 29, 2017
c724c06
Update ha-style.html
Jul 29, 2017
1a36db4
Update ha-panel-dev-state.html
balloob Aug 1, 2017
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
6 changes: 5 additions & 1 deletion panels/dev-service/ha-panel-dev-service.html
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,12 @@
vertical-align: top;
}

.attributes tr:nth-child(odd) {
background-color: var(--table-row-background-color,#eee)
}

.attributes tr:nth-child(even) {
background-color: #eee;
background-color: var(--table-row-alternative-background-color,#eee)
}

.attributes td:nth-child(3) {
Expand Down
6 changes: 5 additions & 1 deletion panels/dev-state/ha-panel-dev-state.html
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,12 @@
vertical-align: top;
}

.entities tr:nth-child(odd) {
background-color: var(--table-row-background-color, #fff)
}

.entities tr:nth-child(even) {
background-color: #eee;
background-color: var(--table-row-alternative-background-color, #eee)
}

.entities td:nth-child(3) {
Expand Down
2 changes: 1 addition & 1 deletion src/cards/ha-media_player-card.html
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@
padding: 8px;
border-bottom-left-radius: 2px;
border-bottom-right-radius: 2px;
background-color: white;
background-color: var(--paper-card-background-color, white);
}

.controls paper-icon-button {
Expand Down
16 changes: 12 additions & 4 deletions src/components/entity/ha-state-label-badge.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,27 @@
}

ha-label-badge {
--ha-label-badge-color: rgb(223, 76, 30);
--ha-label-badge-color: var(--label-badge-red, #DF4C1E);
}

.red {
--ha-label-badge-color: var(--label-badge-red, #DF4C1E);
}

.blue {
--ha-label-badge-color: #039be5;
--ha-label-badge-color: var(--label-badge-blue, #039be5);
}

.green {
--ha-label-badge-color: #0DA035;
--ha-label-badge-color: var(--label-badge-green, #0DA035);
}

.yellow {
--ha-label-badge-color: var(--label-badge-yellow, #f4b400);
}

.grey {
--ha-label-badge-color: var(--paper-grey-500);
--ha-label-badge-color: var(--label-badge-grey, --paper-grey-500);
}
</style>

Expand Down
4 changes: 2 additions & 2 deletions src/components/entity/state-badge.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
position: relative;
display: inline-block;
width: 40px;
color: #44739E;
color: var(--paper-item-icon-color, #44739e);
border-radius: 50%;
height: 40px;
text-align: center;
Expand All @@ -26,7 +26,7 @@
ha-state-icon[data-domain=switch][data-state=on],
ha-state-icon[data-domain=binary_sensor][data-state=on],
ha-state-icon[data-domain=sun][data-state=above_horizon] {
color: #FDD835;
color: var(--paper-item-icon-active-color, #FDD835);
}

/* Color the icon if unavailable */
Expand Down
2 changes: 1 addition & 1 deletion src/components/ha-card.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
border-radius: 2px;
transition: all 0.30s ease-out;

background-color: white;
background-color: var(--paper-card-background-color, white);
}
.header {
@apply(--paper-font-headline);
Expand Down
4 changes: 2 additions & 2 deletions src/components/ha-label-badge.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
font-size: var(--ha-label-badge-font-size, 1.5em);
border-radius: 50%;
border: 0.1em solid var(--ha-label-badge-color, --primary-color);
color: rgb(76, 76, 76);
color: var(--label-badge-text-color, rgb(76, 76, 76));

white-space: nowrap;
background-color: white;
background-color: var(--label-badge-background-color, white);
background-size: cover;
transition: border .3s ease-in-out;
}
Expand Down
1 change: 1 addition & 0 deletions src/components/ha-sidebar.html
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
-webkit-user-select: none;
-moz-user-select: none;
border-right: 1px solid var(--divider-color);
background: var(--paper-listbox-background-color,var(--primary-background-color));
}

app-toolbar {
Expand Down
5 changes: 5 additions & 0 deletions src/layouts/home-assistant-main.html
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@

<dom-module id='home-assistant-main'>
<template>
<style>
:host {
color: var(--primary-text-color);
}
</style>
<more-info-dialog hass='[[hass]]'></more-info-dialog>
<ha-url-sync hass='[[hass]]'></ha-url-sync>
<app-location route="{{route}}"></app-location>
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/partial-cards.html
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
}

app-header-layout {
background-color: #E5E5E5;
background-color: var(--secondary-background-color, #E5E5E5);
}

paper-tabs {
Expand Down
16 changes: 16 additions & 0 deletions src/resources/ha-style.html
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,24 @@
--paper-grey-50: #fafafa;
--paper-grey-200: #eeeeee;

--paper-item-icon-color: #44739e;
--paper-item-icon-active-color: #FDD835;

--dark-primary-color: #0288D1;
--primary-color: #03A9F4;
--light-primary-color: #B3E5FC;
--text-primary-color: #ffffff;
--accent-color: #FF9800;
--primary-background-color: var(--paper-grey-50);
--secondary-background-color: #E5E5E5;
--primary-text-color: #212121;
--secondary-text-color: #727272;
--disabled-text-color: #bdbdbd;
--divider-color: rgba(0, 0, 0, .12);

--table-row-background-color: transparant;
--table-row-alternative-background-color: #eee;

--paper-toggle-button-checked-ink-color: #039be5;
--paper-toggle-button-checked-button-color: #039be5;
--paper-toggle-button-checked-bar-color: #039be5;
Expand All @@ -34,6 +41,15 @@
--paper-card-background-color: #FFF;
--paper-listbox-background-color: #FFF;

/* for label-badge */
--label-badge-background-color: white;
--label-badge-text-color: rgb(76, 76, 76);
--label-badge-red: #DF4C1E;
--label-badge-blue: #039be5;
--label-badge-green: #0DA035;
--label-badge-yellow: #f4b400;
--label-badge-grey: var(--paper-grey-500);

/* Taken from paper-styles/color.html */
/* for paper-spinner */
--google-red-500: #db4437;
Expand Down