Merge branch 'develop' of github.com:nightscout/cgm-remote-monitor into develop

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "dependencies": {
     "d3": "3.4.3",
     "jquery": "2.1.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.",
   "license": "MIT",
   "author": "Nightscout Team",

static/css/drawer.css

@@ -136,7 +136,7 @@ h1, legend,
 #showToolbar,
 #notification {
     display: none;
-    font-size: 16px;
+    font-size: 14px;
     position: absolute;
 }
 #showToolbar {
@@ -148,11 +148,15 @@ h1, legend,
 }
 #showToolbar a {
     border: solid #fff 1px;
+    border-radius: 5px;
     border-top: 0;
     color: #fff;
     margin: 0 auto;
     padding: 2px;
 }
+
+
+
 #notification,
 #notification a {
     overflow: hidden;

static/css/main.css

@@ -31,6 +31,19 @@ body {
     z-index: 100;
 }
 
+
+/* BEGIN: Dolphin/Stock Android Browser Fix */
+@media (max-width: 700px) {
+    .bgStatus {
+        width: 100% !important;
+    }
+}
+#chartContainer {
+    top: 225px; /*(toolbar height + status height)*/
+}
+/* END: Dolphin/Stock Android Browser Fix */
+
+
 .container {
     bottom: 0;
     display: block;
@@ -54,23 +67,34 @@ body {
     font-size: 900%;
     margin-right: 25px;
     text-align: center;
+    white-space: nowrap;
+}
+.bgStatus .currentBG {
     text-decoration: line-through;
 }
-.bgStatus.current {
+.bgStatus.current .currentBG {
     text-decoration: none;
 }
 .currentDirection {
     font-weight: normal;
-    text-decoration: none !important;
+    text-decoration: none;
 }
+
+.status.toolbarClosed .bgStatus {
+    font-size:990%;
+
+}
+
 .time {
     font-size: 600%;
-    margin-left: 25px;
     padding-top: 15px;
 }
+.timebox {
+    text-align: center;
+    width: 250px;
+}
 .timeOther {
     font-size: 25%;
-    margin-left: 32px;
 }
 #lastEntry {
     background: #999;
@@ -93,11 +117,11 @@ body {
     left:0;
     position:absolute;
     right:0;
-    top: calc(180px + 45px);
 }
 #chartContainer svg {
     height: calc(100vh - (180px + 45px));
     width: 100%;
+    top: calc(45px + 180px);
 }
 
 .axis path,
@@ -184,30 +208,6 @@ body {
     font-size: 20%;
 }
 
-
-/*
-@media (max-width: 1060px) {
-    body {
-        font-size: 70%;
-    }
-
-    #toolbar, #buttonbar {
-        font-size: 100%;
-    }
-
-    .status {
-        height: 130px;
-    }
-
-    #chartContainer {
-        top: calc(130px + 45px);
-    }
-    #chartContainer svg {
-        height: calc(100vh - (130px + 45px));
-    }
-}
-*/
-
 /* Large desktop */
 @media (min-width: 980px) {
     .content {
@@ -250,11 +250,17 @@ body {
     #bgButton {display:block;} */
 
     .bgStatus {
+        font-size: 900%;
         float: none;
         margin: 0 auto;
+        padding: 0;
         text-align: center;
         width: 100vw;
     }
+    .status.toolbarClosed .bgStatus {
+        font-size: 990%;
+        margin-top: 10px;
+    }
     #bgButton {
         font-size: 120%;
         height: 142px;
@@ -272,6 +278,10 @@ body {
         margin-left: 0;
         width: 100%;
     }
+    .timebox {
+        text-align: none;
+        width: auto;
+    }
     #currentTime {
         display: inline;
         font-size: 25%;

static/index.html

@@ -46,9 +46,11 @@
                 </div>
 
                 <div class="time">
-                    <div id="currentTime">---</div>
-                    <div class="timeOther">
-                        <span id="lastEntry">---</span>
+                    <div class="timebox">
+                        <div id="currentTime">---</div>
+                        <div class="timeOther">
+                            <span id="lastEntry">---</span>
+                        </div>
                     </div>
                 </div>
             </div>

static/js/ui-utils.js

@@ -192,16 +192,12 @@ function openToolbar() {
 function stretchStatusForToolbar(toolbarState){
 	// closed = up
 	if (toolbarState == "close") {
-		$(".status").css({
-			"font-size": "+125%"
-		});
+		$(".status").addClass("toolbarClosed");
 	}
 
 	// open = down
 	if (toolbarState == "open") {
-		$(".status").css({
-			"font-size": "-125%"
-		});
+		$(".status").removeClass("toolbarClosed");
 	}
 }