simon
/
domoboard
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #85 from wez3/develop 

Develop -> Master
This commit is contained in:
wez3 2017-01-23 16:54:48 +01:00 committed by GitHub
parent bf95d7b553 1f2aefe5b2
commit b88931b023
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION.md
View File

@ -1 +1 @@
1.0.10 1.0.11

8
static/css/custom.css
View File

@ -459,15 +459,15 @@ table.no-margin .progress {
} }
} }
@media (min-width: 992px) and (max-width: 1100px) { @media (min-width: 992px) {
.tile_stats_count .count { .tile_stats_count .count {
font-size: 35px !important; font-size: 2.5vw !important;
} }
} }
@media(max-width:768px) { @media(max-width:768px) {
.tile_stats_count .count { .tile_stats_count .count {
font-size: 5.5vw !important; font-size: 5vw !important;
} }
.tile_stats_count .right span { .tile_stats_count .right span {
font-size: 12px; font-size: 12px;
@ -1961,7 +1961,7 @@ span.right {
} }
.tile_stats_count .count { .tile_stats_count .count {
font-size: 2.5vw; font-size: 3.5vw;
/* line-height: 47px;*/ /* line-height: 47px;*/
font-weight: 600; font-weight: 600;
} }

11
templates/switches.html
View File

@ -141,9 +141,7 @@ $(document).ready(function() {
requestAPI(flask_server + url, function(d) { requestAPI(flask_server + url, function(d) {
r = JSON.parse(d); r = JSON.parse(d);
btns = r['result'][0]['LevelNames'].split('|'); btns = r['result'][0]['LevelNames'].split('|');
if (r['result'][0]['LevelOffHidden'] == true) {
btns.shift();
}
$.each(btns, function (i, lvlname) { $.each(btns, function (i, lvlname) {
activebtn = r['result'][0]['Level'] activebtn = r['result'][0]['Level']
if (i != '0') { if (i != '0') {
@ -154,8 +152,13 @@ $(document).ready(function() {
} else { } else {
btnClass = 'btn btn-responsive'; btnClass = 'btn btn-responsive';
} }
if (r['result'][0]['LevelOffHidden'] == true && lvlname == 'Off') {
style = 'style="display: none;"';
} else {
style = '';
}
bid = 'selector_{{v[1]}}_block_{{count}}_index_'; bid = 'selector_{{v[1]}}_block_{{count}}_index_';
b = '<button id="' + bid + i + '" onclick="switchSelector({{v[1]}}, ' + i + ', this.id)" class="' + btnClass + '">' + lvlname + '</button>'; b = '<button id="' + bid + i + '" onclick="switchSelector({{v[1]}}, ' + i + ', this.id)" class="' + btnClass + '"' + style + '>' + lvlname + '</button>';
$('#selector_body_{{v[1]}}_block_{{count}}').append(b); $('#selector_body_{{v[1]}}_block_{{count}}').append(b);
$('#' + 'selector_{{v[1]}}_block_{{count}}_index_' + i).click(function(e) { $('#' + 'selector_{{v[1]}}_block_{{count}}_index_' + i).click(function(e) {
e.preventDefault(); e.preventDefault();