Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

display of noise level and rawbg value when rawbg is enabled #506

Merged
merged 14 commits into from
Mar 22, 2015
Merged

display of noise level and rawbg value when rawbg is enabled #506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
058548e
Merge pull request #28 from nightscout/master
ELUTE Jan 21, 2015
7772e2e
Merge pull request #34 from nightscout/master
ELUTE Feb 25, 2015
ed264b1
initial display of noise level when rawbg is enabled
jasoncalabrese Mar 20, 2015
1431be6
display rawbg in top right if enabled; fix alarm button border
jasoncalabrese Mar 20, 2015
7b55466
Merge pull request #50 from nightscout/wip/noise
ELUTE Mar 21, 2015
f88ea05
add circle around raw
ELUTE Mar 21, 2015
58ded60
Merge pull request #508 from ELUTE/wip/rawcircle
jasoncalabrese Mar 21, 2015
209e359
tons of css adjustments, moved rawbg to the left, focus selectors to …
jasoncalabrese Mar 21, 2015
084e00b
don't let the tip of the arrow get clipped
jasoncalabrese Mar 21, 2015
9bed536
fixed some bugs releated to when to show raw, also more css tweeks
jasoncalabrese Mar 21, 2015
f58b2fa
adjusted (max-height: 480px) and (min-width: 400px) break point to pr…
jasoncalabrese Mar 21, 2015
b3a5cf4
only update the chart when the document is visible
jasoncalabrese Mar 22, 2015
b3d5b17
new raw bg/noise vertical pill
jasoncalabrese Mar 22, 2015
661f282
Merge branch 'wip/only-when-visible' into wip/noise
jasoncalabrese Mar 22, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions static/css/drawer.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ h1, legend,
top: 0;
margin: 0;
height: 44px;
text-shadow: 0 0 5px black;
}

#toolbar h1 {
Expand Down
101 changes: 72 additions & 29 deletions static/css/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ body {
float: right;
text-align: center;
white-space: nowrap;
padding-right: 20px;
}

.bgButton.urgent {
Expand Down Expand Up @@ -203,21 +204,43 @@ body {
margin: 10px;
border: 2px solid #000;
border-radius: 5px;
width: 320px;
width: 360px;
}

.loading .bgButton .rawnoise {
display: none;
}

.bgButton .rawnoise {
display: inline-block;
border-radius: 2px;
border: 1px solid #808080;
}

.bgButton .rawnoise em {
color: white;
background-color: black;
display: block;
font-size: 20px;
}

.bgButton .rawnoise label {
display: block;
font-size: 14px;
}

.alarming .bgButton {
border-color: #bdbdbd;
color: #000;
box-shadow: 2px 2px 0 #ddd;
border-color: #bdbdbd;
color: #000;
box-shadow: 2px 2px 0 #ddd;
}

.alarming .bgButton.urgent {
background-color: red;
background-color: red;
}

.alarming .bgButton.warning {
background-color: yellow;
background-color: yellow;
}

.alarming .bgButton:active {
Expand All @@ -227,6 +250,7 @@ body {
-webkit-box-shadow: none;
}


.button {
text-align: center;
background: #ababab;
Expand Down Expand Up @@ -280,7 +304,7 @@ div.tooltip {

@media (max-width: 800px) {
.bgStatus {
width: 40%;
width: 300px;
}

.bgButton {
Expand Down Expand Up @@ -343,7 +367,16 @@ div.tooltip {

@media (max-width: 750px) {
.bgStatus {
width: 60%;
width: 240px;
padding: 0;
}

.bgButton .rawnoise em {
font-size: 14px;
}

.bgButton .rawnoise label {
font-size: 12px;
}

.bgStatus .currentBG {
Expand Down Expand Up @@ -388,11 +421,12 @@ div.tooltip {

.bgStatus {
float: none;
margin: 0 auto;
padding: 0;
width: 100vw;
text-align: center;
width: 250px;
}


.bgButton {
margin: 5px;
width: auto;
Expand Down Expand Up @@ -424,15 +458,10 @@ div.tooltip {
}

.time {
width: auto;
padding-top: 0;
font-size: 20px !important;
}

#container.alarming .time {
display: none;
}

.timebox {
width: auto;
}
Expand All @@ -452,14 +481,11 @@ div.tooltip {
font-size: 15px !important;
}

.alarming .focus-range {
display: none;
}

.focus-range {
position: absolute;
top: 70px;
left: 20px;
top: 80px;
left: initial;
right: 10px;
margin: 0;
width: auto;
}
Expand Down Expand Up @@ -514,26 +540,26 @@ div.tooltip {

@media (max-height: 480px) and (min-width: 400px) {
.bgStatus .currentBG {
font-size: 80px;
line-height: 80px;
font-size: 70px;
line-height: 60px;
}

.bgStatus .currentBG.bg-limit, .bgStatus .currentBG.icon-hourglass {
font-size: 70px;
}

.bgStatus .currentDirection {
font-size: 70px;
line-height: 70px;
font-size: 50px;
line-height: 50px;
}

.bgStatus .currentDetails {
font-size: 15px;
}

.time {
font-size: 70px;
line-height: 60px;
font-size: 50px;
line-height: 40px;
padding-top: 5px;
}

Expand All @@ -549,6 +575,13 @@ div.tooltip {

@media (max-height: 480px) and (max-width: 400px) {

.bgStatus {
text-align: center;
width: 220px;
left: 0;
position: absolute;
}

.bgStatus .currentBG {
font-size: 60px;
line-height: 60px;
Expand All @@ -569,8 +602,9 @@ div.tooltip {

.focus-range {
position: absolute;
top: 10px;
left: 10px;
top: 40px;
left: initial;
right: 35px;
margin: 0;
width: auto;
}
Expand All @@ -579,4 +613,13 @@ div.tooltip {
display: block;
}

.time {
position: absolute;
top: 90px;
}

.timebox {
width: 220px;
}

}
1 change: 1 addition & 0 deletions static/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ <h1 class="customTitle">Nightscout</h1>
<div class="status">
<div class="bgStatus current">
<div class="bgButton ">
<span class="rawnoise pill"><em></em><label></label></span>
<span class="currentBG">---</span>
<span class="currentDirection">-</span>
</div>
Expand Down
Loading