update with changes from Production branch

This commit is contained in:
Lee Lawlor
2014-02-17 12:05:39 -05:00
parent 5b640cf9d8
commit a4937fb2e5
384 changed files with 14690 additions and 2242 deletions

View File

@ -5,12 +5,7 @@
<style type="text/css">
body { background-color: #fff; color: #666; text-align: center; font-family: arial, sans-serif; }
div.dialog {
width: 25em;
padding: 0 4em;
margin: 4em auto 0 auto;
border: 1px solid #ccc;
border-right-color: #999;
border-bottom-color: #999;
margin: 3em auto 0 auto;
}
h1 { font-size: 100%; color: #f00; line-height: 1.5em; }
</style>
@ -18,9 +13,11 @@
<body>
<!-- This file lives in public/500.html -->
<img src='/assets/ThingSpeak_Logo.png' width='300' height='79' />
<div class="dialog">
<h1>We're sorry, but something went wrong.</h1>
<p>We've been notified about this issue and we'll take a look at it shortly.</p>
<br />
<p>Please send an email to <a href="mailto:support@thingspeak.com">support@thingspeak.com</a> if this problem persists.</p>
</div>
</body>
</html>