Merge branch 'master' into release

This commit is contained in:
Jason Williams 2018-08-06 15:26:11 -06:00
commit 90de299bc0

View File

@ -18,22 +18,21 @@
<html> <html>
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>Welcome to JnF.me</title> <link href="//fonts.googleapis.com/css?family=Open+Sans" rel="stylesheet">
<link href='//fonts.googleapis.com/css?family=Source+Sans+Pro:300' rel='stylesheet' type='text/css'>
<style type="text/css"> <style type="text/css">
* {box-sizing: border-box; margin: 0; border: 0; padding: 0; font-family: 'Source Sans Pro', sans-serif; font-weight: 300; text-align: center;} * {box-sizing: border-box; margin: 0; border: 0; padding: 0; font-family: 'Open Sans', sans-serif; font-weight: 400; text-align: center;}
html, body {height: 100%; min-height: 100%;} html, body {height: 100%; min-height: 100%;}
body {background-color: #333333;} body {background-color: #333333;}
p {font-size: 10vh;} p {font-size: 5vh; color: #FFFFFF; opacity: 0.5;}
h1 {font-size: 20vh; color: #FFFFFF;} h1 {font-size: 14vh; color: #FFFFFF;}
#container {width: 100%; height: 100%; border: 1.5vw solid #333333; background-color: #3e5381;} #container {width: 100%; height: 100%; border: 1.5vw solid #333333; background: linear-gradient(135deg, #a25cbf 0%,#009cde 100%);}
#centered {position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);} #centered {position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);}
</style> </style>
<body> <body>
<div id="container"> <div id="container">
<div id="centered"> <div id="centered">
<p>Where tf is Jason?</p> <p>Where tf is Jason?</p>
<h1><?= ucwords($output['device_tracker.jasonsphone_jason']['state']) ?></h1> <h1><? echo ($output['device_tracker.jasonsphone_jason']['state'] == 'away') ? 'Nobody Knows' : 'At '.ucwords($output['device_tracker.jasonsphone_jason']['state']); ?></h1>
</div> </div>
</div> </div>
</body> </body>