Merge pull request #2544 from home-assistant/dev

Hopefully this will work (#2543)
This commit is contained in:
Paulus Schoutsen 2019-01-23 11:24:00 -08:00 committed by GitHub
commit c972d039bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 14 deletions

2
.gitattributes vendored
View File

@ -9,3 +9,5 @@
*.png binary *.png binary
*.zip binary *.zip binary
*.mp3 binary *.mp3 binary
demo/public/api/camera_proxy_stream/* binary

Binary file not shown.

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 81 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 60 KiB

After

Width:  |  Height:  |  Size: 60 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

View File

@ -6170,7 +6170,7 @@ export const demoEntitiesArsaboo: () => Entity[] = () =>
}, },
"light.lifx5": { "light.lifx5": {
entity_id: "light.lifx5", entity_id: "light.lifx5",
state: "off", state: "on",
attributes: { attributes: {
min_mireds: 111, min_mireds: 111,
max_mireds: 400, max_mireds: 400,

View File

@ -135,10 +135,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
off: "brightness(80%) saturate(0.8)", off: "brightness(80%) saturate(0.8)",
}, },
style: { style: {
top: "48%", top: "40%",
left: "11%", left: "11%",
width: "7%", width: "7%",
padding: "50px 50px 100px 50px", padding: "10px",
}, },
}, },
{ {
@ -218,10 +218,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
off: "brightness(80%) saturate(0.8)", off: "brightness(80%) saturate(0.8)",
}, },
style: { style: {
top: "38%", top: "34%",
left: "50%", left: "50%",
width: "7%", width: "7%",
padding: "50px 50px 100px 50px", padding: "10px",
}, },
}, },
{ {
@ -299,10 +299,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
off: "brightness(80%) saturate(0.8)", off: "brightness(80%) saturate(0.8)",
}, },
style: { style: {
top: "98%", top: "92%",
left: "20%", left: "20%",
width: "7%", width: "7%",
padding: "50px 50px 100px 50px", padding: "10px",
}, },
}, },
{ {
@ -337,10 +337,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
off: "brightness(80%) saturate(0.8)", off: "brightness(80%) saturate(0.8)",
}, },
style: { style: {
top: "68%", top: "60%",
left: "78%", left: "78%",
width: "7%", width: "7%",
padding: "50px 50px 100px 50px", padding: "10px",
}, },
}, },
{ {
@ -358,11 +358,10 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
off: "brightness(80%) saturate(0.8)", off: "brightness(80%) saturate(0.8)",
}, },
style: { style: {
top: "81%", top: "84%",
left: "63%", left: "82%",
width: "7%", width: "7%",
padding: "0 50px 100px 50px", padding: "10px",
transform: "none",
}, },
}, },
{ {
@ -491,7 +490,7 @@ export const demoLovelaceArsaboo: () => LovelaceConfig = () => ({
top: "70%", top: "70%",
left: "80%", left: "80%",
width: "7%", width: "7%",
padding: "50px 50px 100px 50px", padding: "10px",
}, },
}, },
{ {