From aa62b266a1be2ba443101709013b7239594a482c Mon Sep 17 00:00:00 2001 From: wez3 Date: Sun, 22 Jan 2017 19:23:44 +0100 Subject: [PATCH 1/3] Improve viewports top tiles --- static/css/custom.css | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/css/custom.css b/static/css/custom.css index 5e3003f..a22a69f 100755 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -459,15 +459,15 @@ table.no-margin .progress { } } -@media (min-width: 992px) and (max-width: 1100px) { +@media (min-width: 992px) { .tile_stats_count .count { - font-size: 35px !important; + font-size: 2.5vw !important; } } @media(max-width:768px) { .tile_stats_count .count { - font-size: 5.5vw !important; + font-size: 5vw !important; } .tile_stats_count .right span { font-size: 12px; @@ -1961,7 +1961,7 @@ span.right { } .tile_stats_count .count { - font-size: 2.5vw; + font-size: 3.5vw; /* line-height: 47px;*/ font-weight: 600; } From 9efa5d6a36bb35a99c6657461c4b3d1531aae847 Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 23 Jan 2017 14:17:09 +0100 Subject: [PATCH 2/3] Fixed bug selector Switch #84 --- templates/switches.html | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/templates/switches.html b/templates/switches.html index b5439e0..4b5ffee 100644 --- a/templates/switches.html +++ b/templates/switches.html @@ -141,9 +141,7 @@ $(document).ready(function() { requestAPI(flask_server + url, function(d) { r = JSON.parse(d); btns = r['result'][0]['LevelNames'].split('|'); - if (r['result'][0]['LevelOffHidden'] == true) { - btns.shift(); - } + $.each(btns, function (i, lvlname) { activebtn = r['result'][0]['Level'] if (i != '0') { @@ -154,8 +152,13 @@ $(document).ready(function() { } else { 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_'; - b = ''; + b = ''; $('#selector_body_{{v[1]}}_block_{{count}}').append(b); $('#' + 'selector_{{v[1]}}_block_{{count}}_index_' + i).click(function(e) { e.preventDefault(); From 1f2aefe5b26db8f59e8a33a1d972fd8f48811fc7 Mon Sep 17 00:00:00 2001 From: Squandor Date: Mon, 23 Jan 2017 14:40:04 +0100 Subject: [PATCH 3/3] updated version.md --- VERSION.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.md b/VERSION.md index 7ee7020..59e9e60 100644 --- a/VERSION.md +++ b/VERSION.md @@ -1 +1 @@ -1.0.10 +1.0.11