changeset 584:557a72cbd0e6

merge
author Matt Johnston <matt@ucc.asn.au>
date Mon, 27 Feb 2017 23:27:45 +0800
parents 358c50004679 (diff) dda1bef0632f (current diff)
children
files
diffstat 3 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/web/log.py	Wed Mar 23 21:34:44 2016 +0800
+++ b/web/log.py	Mon Feb 27 23:27:45 2017 +0800
@@ -104,7 +104,7 @@
             graph_args.append('DEF:raw%(vname)s=%(rrdfile)s:temp:AVERAGE' % locals())
             # limit max temp to 50
             graph_args.append('CDEF:%(vname)s=raw%(vname)s,38,GT,UNKN,raw%(vname)s,%(volts_mult)f,*,%(volts_shift)f,+,IF' % locals())
-            unit = '<span face="Liberation Serif">º</span>C'
+            unit = '<span face="Liberation Serif">°</span>C'
 
         format_last_value = None
         if unit:
@@ -291,7 +291,7 @@
     'fridge_setpoint': 16.0,
     'fridge_difference': 0.2,
     'overshoot_delay': 720, # 12 minutes
-    'overshoot_factor': 1.0, # ºC
+    'overshoot_factor': 1.0, # °C
     'disabled': False,
     'nowort': True,
     'fridge_range_lower': 3,
@@ -319,7 +319,7 @@
                 n['amount'] = 60
                 n['digits'] = 0;
             else:
-                n['unit'] = 'º'
+                n['unit'] = '°'
                 n['amount'] = 0.1;
                 n['digits'] = 1;
         n['kind'] = kind
--- a/web/views/set.tpl	Wed Mar 23 21:34:44 2016 +0800
+++ b/web/views/set.tpl	Mon Feb 27 23:27:45 2017 +0800
@@ -8,6 +8,7 @@
 <script>
 %include riot.min.js
 </script>
+<meta name="theme-color" content="#fff">
 
 <style type="text/css">
 span.no_selection {
@@ -36,7 +37,7 @@
     -webkit-appearance: none;
     -moz-appearance: none;
     background:#fff;
-    vertical-align: center;
+    vertical-align: middle;
 }
 
 input[type="submit"] {
--- a/web/views/top.tpl	Wed Mar 23 21:34:44 2016 +0800
+++ b/web/views/top.tpl	Mon Feb 27 23:27:45 2017 +0800
@@ -3,6 +3,7 @@
 <head>
 <title>Wort Temperature Log</title>
 <meta name="viewport" content="width=device-width">
+<meta name="theme-color" content="#fff">
 <style type="text/css">
 span.no_selection {
     -webkit-user-select: none; // webkit (safari, chrome) browsers