Skip to content

Commit

Permalink
Merge branch 'hotfix/0.3.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
brianhanifin committed Jul 30, 2014
2 parents b726977 + d4984bf commit da667e0
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 41 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nightscout",
"version": "0.3.2",
"version": "0.3.3",
"dependencies": {
"d3": "3.4.3",
"jquery": "2.1.0",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
6 changes: 5 additions & 1 deletion static/css/drawer.css
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ h1, legend,
#showToolbar,
#notification {
display: none;
font-size: 16px;
font-size: 14px;
position: absolute;
}
#showToolbar {
Expand All @@ -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;
Expand Down
68 changes: 39 additions & 29 deletions static/css/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,19 @@ body {
color: #808080;
}


/* 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;
Expand All @@ -38,23 +51,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;
Expand All @@ -77,11 +101,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,
Expand Down Expand Up @@ -168,30 +192,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 {
Expand Down Expand Up @@ -234,11 +234,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;
Expand All @@ -256,6 +262,10 @@ body {
margin-left: 0;
width: 100%;
}
.timebox {
text-align: none;
width: auto;
}
#currentTime {
display: inline;
font-size: 25%;
Expand Down
8 changes: 5 additions & 3 deletions static/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,11 @@ <h1 class="customTitle">Nightscout</h1>
</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>
Expand Down
8 changes: 2 additions & 6 deletions static/js/ui-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,16 +174,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");
}
}

Expand Down

0 comments on commit da667e0

Please sign in to comment.