From f5163f3dacf1f5a477cfa6cf1eccc0ac6c9ca763 Mon Sep 17 00:00:00 2001 From: Nigel Johnson Date: Thu, 16 Jul 2020 20:34:08 +0100 Subject: [PATCH] Fixed alarm status colours --- css/app.nocr.css | 2 +- css/app.nopack.css | 7 +++---- css/app.packed.css | 2 +- css/raw/app.css | 9 ++++----- pages/home.php | 12 ++++++------ 5 files changed, 15 insertions(+), 17 deletions(-) diff --git a/css/app.nocr.css b/css/app.nocr.css index 83de627..cd1da32 100644 --- a/css/app.nocr.css +++ b/css/app.nocr.css @@ -1 +1 @@ -body { font-family: 'Lato', sans-serif; font-weight: 400; line-height: 1.6; font-size: 16px; color: #999;}p { margin-bottom: 1em;}strong { font-weight: 700; color: #666;}blockquote { font-family: 'Architects Daughter', cursive;}textarea.text-input { font-family: Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace;}h1, h2, h3, h4 { margin-top: 30px; margin-bottom: 20px; text-transform: none; color: #333;}h1:first-of-type { margin-top: 0px;}h1, h2 { font-weight: 600;}h3, h4 { font-weight: 400;}h1 { font-size: 22px; text-transform: uppercase;}h2 { font-size: 22px;}h3 { font-size: 20px;}h4 { font-size: 18px;}p, li { margin-bottom: 10px;}li p { margin-bottom: 0px;}a { color: #3b0084;}a:link, a:visited, a:link:active, a:visited:active { color: #3b0084; cursor: auto; font-weight: 600;}a:hover { color: #6000ff;}pre { text-align: left;}.container-fluid { padding: 30px 10px;}.close { line-height: 1.4em;}.bg-grey { background-color: #eee;}footer.app-footer { background-color: #3b0084 !important; color: #fff !important;}@media screen and (max-width: 768px) { }textarea.ng-invalid.ng-pristine, input.ng-invalid.ng-pristine { box-shadow: 0px 0px 20px rgba(255, 164, 0, .3); border-color: #ccc;}textarea.ng-invalid.ng-dirty, input.ng-invalid.ng-dirty { box-shadow: 0px 0px 20px rgba(128, 0, 0, .9); border-color: #f00; color: #f00;}textarea.ng-valid.ng-dirty, input.ng-valid.ng-dirty { box-shadow: 0px 0px 20px rgba(0, 203, 0, .3); border-color: #090;}@media ( max-width : 767px) { .pull-right-xs { float: right; }}@media ( min-width : 768px) and (max-width: 991px) { .pull-right-xs { float: right; } .pull-right-sm { float: right; }}@media ( min-width : 992px) and (max-width: 1199px) { .pull-right-xs { float: right; } .pull-right-sm { float: right; } .pull-right-md { float: right; }}@media ( min-width : 1200px) { .pull-right-xs { float: right; } .pull-right-sm { float: right; } .pull-right-md { float: right; } .pull-right-lg { float: right; }}#page-loading { padding-top: 50px; width: 100%; margin: 0 auto; text-align: center; width: 100%;}#page-loading img { margin: 0 auto;}strong.indicator { font-weight: 600; color: #f00;}footer { border-top: solid 1px #ddd;}nav.navbar { border: 0; border-top: solid 1px #ccc; border-radius: 0; margin: 0; }.nav-justified>li>a, .nav-justified>li.active>a { border: 0; border-bottom: solid 1px #ddd !important;}.nav-justified>li.active>a { background-color: #eee;}nav .nav, footer nav .nav li { margin: 0;}.headliner { border-bottom: solid 1px #ccc;}.headliner img { margin: 0 auto; margin-top: 10px; margin-bottom: 20px;}footer { border-top: solid 1px #ccc; background-color: #fff !important; color: #3b0084 !important; padding-top: 10px; padding-bottom: 50px;}footer.app-footer p { line-height: 1.4em;}@media ( max-width : 768px) { .nav-justified>li { display: table-cell; width: 1%; } .nav-justified>li>a { border-bottom: 1px solid #ddd !important; border-radius: 6px 6px 0 0 !important; margin-bottom: 0 !important; } .nav-justified>li.active>a { border-bottom: 1px solid transparent !important; }}.table-striped tbody>tr:nth-child(even)>td, .table-striped tbody>tr:nth-child(even)>th { background-color: #f1f1f1;}.form-control.disabled { color: #ddd;}.btn-group button.btn { border-radius: 0px;}.btn-group button.btn:first-child { border-radius: 6px 0 0 6px;}.btn-group button.btn:last-child { border-radius: 0 6px 6px 0;}.tab-pane { padding-top:10px; padding-bottom:20px;}cover { position: absolute; top: 0; bottom: 0; left: 0; right: 0;}.covered { position: relative;}.covered img { display: none;}.snapshot-container { margin-bottom: 20px;}.location-container, .nextsun-container { margin: auto; width: 60%; min-width: 350px; padding-left: 10px; padding-right: 10px; padding-bottom: 10px; padding-top: 5px; border: solid 1px #ccc; background-color: #eee; border-radius: 10px; margin-bottom: 20px;}.nextsun-container { padding-top:20px; padding-bottom:20px; font-weight: 500; font-size: 18pt; text-transform: capitalize;}.colour-container, .trigger-container, .sensor-container { text-align: center; vertical-align: top; margin-bottom: 10px;}.colour-holder, .trigger-holder, .sensor-holder { display: inline-block; margin: 0 auto; width: 80px; padding-left: 10px; padding-right: 10px; padding-bottom: 10px; padding-top: 5px; margin-right: 5px;}.sensor-holder { width: 120px; border: solid 1px #ccc; border-radius: 10px; margin-bottom: 10px;}.demand-holder { margin-left: 5px; margin-right: 3px;}.sensor-holder .name { color: #333;}.alarm-holder.alarm-never { background-color: #cfc; color: #999;}.alarm-holder.alarm-yes { background-color: #fc9; color: #666;}.alarm-holder.alarm-now { border-color: #000; background-color: #c00; color: #ccc; background-color: #c00;}.sensor-holder.light-moon .name { color: #fff;}.sensor-holder.light-sun .name { color: #333;}.sensor-holder.state-alarm .name { color: #fff;}.sensor-holder.state-normal .name { color: #333;}.sensor-holder.light-moon { background-color: #003; color: #aaa;}.sensor-holder.light-sun { background-color: #fc9; color: #666;}.sensor-holder.state-alarm { border-color: #000; background-color: #c00; color: #ccc; background-color: #c00;}.sensor-holder.state-normal { background-color: #cfc; color: #999;}.sensor-holder.state-disabled, .sensor-holder.state-disabled .name, .trigger-holder.state-disabled { background-color: #dadada; color: #aaa;}.trigger-holder { width: 80px; border: solid 1px #ccc; border-radius: 10px; margin-bottom: 10px;}.trigger-holder.state-on { background-color:#0c0; color:#fff;}.trigger-holder.state-off { background-color:#030; color:#999; }.chart-container { position: relative;}@CHARSET "UTF-8";#snackbar { visibility: hidden; min-width: 250px; margin-left: -125px; background-color: #333; color: #fff; text-align: center; border-radius: 3px; padding: 16px; position: fixed; z-index: 1; left: 50%; bottom: 30px; }#snackbar.show { visibility: visible; -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s; animation: fadein 0.5s, fadeout 0.5s 2.5s;}@-webkit-keyframes fadein { from {bottom: 0; opacity: 0;} to {bottom: 30px; opacity: 1;}}@keyframes fadein { from {bottom: 0; opacity: 0;} to {bottom: 30px; opacity: 1;}}@-webkit-keyframes fadeout { from {bottom: 30px; opacity: 1;} to {bottom: 0; opacity: 0;}}@keyframes fadeout { from {bottom: 30px; opacity: 1;} to { bottom: 0; opacity: 0;}} \ No newline at end of file +body { font-family: 'Lato', sans-serif; font-weight: 400; line-height: 1.6; font-size: 16px; color: #999;}p { margin-bottom: 1em;}strong { font-weight: 700; color: #666;}blockquote { font-family: 'Architects Daughter', cursive;}textarea.text-input { font-family: Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace;}h1, h2, h3, h4 { margin-top: 30px; margin-bottom: 20px; text-transform: none; color: #333;}h1:first-of-type { margin-top: 0px;}h1, h2 { font-weight: 600;}h3, h4 { font-weight: 400;}h1 { font-size: 22px; text-transform: uppercase;}h2 { font-size: 22px;}h3 { font-size: 20px;}h4 { font-size: 18px;}p, li { margin-bottom: 10px;}li p { margin-bottom: 0px;}a { color: #3b0084;}a:link, a:visited, a:link:active, a:visited:active { color: #3b0084; cursor: auto; font-weight: 600;}a:hover { color: #6000ff;}pre { text-align: left;}.container-fluid { padding: 30px 10px;}.close { line-height: 1.4em;}.bg-grey { background-color: #eee;}footer.app-footer { background-color: #3b0084 !important; color: #fff !important;}@media screen and (max-width: 768px) { }textarea.ng-invalid.ng-pristine, input.ng-invalid.ng-pristine { box-shadow: 0px 0px 20px rgba(255, 164, 0, .3); border-color: #ccc;}textarea.ng-invalid.ng-dirty, input.ng-invalid.ng-dirty { box-shadow: 0px 0px 20px rgba(128, 0, 0, .9); border-color: #f00; color: #f00;}textarea.ng-valid.ng-dirty, input.ng-valid.ng-dirty { box-shadow: 0px 0px 20px rgba(0, 203, 0, .3); border-color: #090;}@media ( max-width : 767px) { .pull-right-xs { float: right; }}@media ( min-width : 768px) and (max-width: 991px) { .pull-right-xs { float: right; } .pull-right-sm { float: right; }}@media ( min-width : 992px) and (max-width: 1199px) { .pull-right-xs { float: right; } .pull-right-sm { float: right; } .pull-right-md { float: right; }}@media ( min-width : 1200px) { .pull-right-xs { float: right; } .pull-right-sm { float: right; } .pull-right-md { float: right; } .pull-right-lg { float: right; }}#page-loading { padding-top: 50px; width: 100%; margin: 0 auto; text-align: center; width: 100%;}#page-loading img { margin: 0 auto;}strong.indicator { font-weight: 600; color: #f00;}footer { border-top: solid 1px #ddd;}nav.navbar { border: 0; border-top: solid 1px #ccc; border-radius: 0; margin: 0; }.nav-justified>li>a, .nav-justified>li.active>a { border: 0; border-bottom: solid 1px #ddd !important;}.nav-justified>li.active>a { background-color: #eee;}nav .nav, footer nav .nav li { margin: 0;}.headliner { border-bottom: solid 1px #ccc;}.headliner img { margin: 0 auto; margin-top: 10px; margin-bottom: 20px;}footer { border-top: solid 1px #ccc; background-color: #fff !important; color: #3b0084 !important; padding-top: 10px; padding-bottom: 50px;}footer.app-footer p { line-height: 1.4em;}@media ( max-width : 768px) { .nav-justified>li { display: table-cell; width: 1%; } .nav-justified>li>a { border-bottom: 1px solid #ddd !important; border-radius: 6px 6px 0 0 !important; margin-bottom: 0 !important; } .nav-justified>li.active>a { border-bottom: 1px solid transparent !important; }}.table-striped tbody>tr:nth-child(even)>td, .table-striped tbody>tr:nth-child(even)>th { background-color: #f1f1f1;}.form-control.disabled { color: #ddd;}.btn-group button.btn { border-radius: 0px;}.btn-group button.btn:first-child { border-radius: 6px 0 0 6px;}.btn-group button.btn:last-child { border-radius: 0 6px 6px 0;}.tab-pane { padding-top:10px; padding-bottom:20px;}cover { position: absolute; top: 0; bottom: 0; left: 0; right: 0;}.covered { position: relative;}.covered img { display: none;}.snapshot-container { margin-bottom: 20px;}.location-container, .nextsun-container { margin: auto; width: 60%; min-width: 350px; padding-left: 10px; padding-right: 10px; padding-bottom: 10px; padding-top: 5px; border: solid 1px #ccc; background-color: #eee; border-radius: 10px; margin-bottom: 20px;}.nextsun-container { padding-top:20px; padding-bottom:20px; font-weight: 500; font-size: 18pt; text-transform: capitalize;}.colour-container, .trigger-container, .sensor-container, .alarm-holder { text-align: center; vertical-align: top; margin-bottom: 10px;}.colour-holder, .trigger-holder, .sensor-holder, .alarm-holder { display: inline-block; margin: 0 auto; width: 80px; padding-left: 10px; padding-right: 10px; padding-bottom: 10px; padding-top: 5px; margin-right: 5px;}.sensor-holder, .alarm-holder { width: 120px; border: solid 1px #ccc; border-radius: 10px; margin-bottom: 10px;}.demand-holder { margin-left: 5px; margin-right: 3px;}.sensor-holder .name { color: #333;}.alarm-holder.alarm-never { background-color: #cfc; color: #999;}.alarm-holder.alarm-yes { background-color: #fc9; color: #666;}.alarm-holder.alarm-now { border-color: #000; color: #ccc; background-color: #c00;}.sensor-holder.light-moon .name { color: #fff;}.sensor-holder.light-sun .name { color: #333;}.sensor-holder.state-alarm .name { color: #fff;}.sensor-holder.state-normal .name { color: #333;}.sensor-holder.light-moon { background-color: #003; color: #aaa;}.sensor-holder.light-sun { background-color: #fc9; color: #666;}.sensor-holder.state-alarm { border-color: #000; background-color: #c00; color: #ccc; background-color: #c00;}.sensor-holder.state-normal { background-color: #cfc; color: #999;}.sensor-holder.state-disabled, .sensor-holder.state-disabled .name, .trigger-holder.state-disabled { background-color: #dadada; color: #aaa;}.trigger-holder { width: 80px; border: solid 1px #ccc; border-radius: 10px; margin-bottom: 10px;}.trigger-holder.state-on { background-color:#0c0; color:#fff;}.trigger-holder.state-off { background-color:#030; color:#999; }.chart-container { position: relative;}@CHARSET "UTF-8";#snackbar { visibility: hidden; min-width: 250px; margin-left: -125px; background-color: #333; color: #fff; text-align: center; border-radius: 3px; padding: 16px; position: fixed; z-index: 1; left: 50%; bottom: 30px; }#snackbar.show { visibility: visible; -webkit-animation: fadein 0.5s, fadeout 0.5s 2.5s; animation: fadein 0.5s, fadeout 0.5s 2.5s;}@-webkit-keyframes fadein { from {bottom: 0; opacity: 0;} to {bottom: 30px; opacity: 1;}}@keyframes fadein { from {bottom: 0; opacity: 0;} to {bottom: 30px; opacity: 1;}}@-webkit-keyframes fadeout { from {bottom: 30px; opacity: 1;} to {bottom: 0; opacity: 0;}}@keyframes fadeout { from {bottom: 30px; opacity: 1;} to { bottom: 0; opacity: 0;}} \ No newline at end of file diff --git a/css/app.nopack.css b/css/app.nopack.css index 78e124d..7265d87 100644 --- a/css/app.nopack.css +++ b/css/app.nopack.css @@ -327,13 +327,13 @@ cover { text-transform: capitalize; } -.colour-container, .trigger-container, .sensor-container { +.colour-container, .trigger-container, .sensor-container, .alarm-holder { text-align: center; vertical-align: top; margin-bottom: 10px; } -.colour-holder, .trigger-holder, .sensor-holder { +.colour-holder, .trigger-holder, .sensor-holder, .alarm-holder { display: inline-block; margin: 0 auto; width: 80px; @@ -344,7 +344,7 @@ cover { margin-right: 5px; } -.sensor-holder { +.sensor-holder, .alarm-holder { width: 120px; border: solid 1px #ccc; border-radius: 10px; @@ -372,7 +372,6 @@ cover { .alarm-holder.alarm-now { border-color: #000; - background-color: #c00; color: #ccc; background-color: #c00; } diff --git a/css/app.packed.css b/css/app.packed.css index 3048fc6..2116b19 100644 --- a/css/app.packed.css +++ b/css/app.packed.css @@ -1 +1 @@ -body{font-family:'Lato', sans-serif;font-weight:400;line-height:1.6;font-size:16px;color:#999}p{margin-bottom:1em}strong{font-weight:700;color:#666}blockquote{font-family:'Architects Daughter', cursive}textarea.text-input{font-family:Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace}h1,h2,h3,h4{margin-top:30px;margin-bottom:20px;text-transform:none;color:#333}h1:first-of-type{margin-top:0px}h1,h2{font-weight:600}h3,h4{font-weight:400}h1{font-size:22px;text-transform:uppercase}h2{font-size:22px}h3{font-size:20px}h4{font-size:18px}p,li{margin-bottom:10px}li p{margin-bottom:0px}a{color:#3b0084}a:link,a:visited,a:link:active,a:visited:active{color:#3b0084;cursor:auto;font-weight:600}a:hover{color:#6000ff}pre{text-align:left}.container-fluid{padding:30px 10px}.close{line-height:1.4em}.bg-grey{background-color:#eee}footer.app-footer{background-color:#3b0084 !important;color:#fff !important}textarea.ng-invalid.ng-pristine,input.ng-invalid.ng-pristine{box-shadow:0px 0px 20px rgba(255, 164, 0, .3);border-color:#ccc}textarea.ng-invalid.ng-dirty,input.ng-invalid.ng-dirty{box-shadow:0px 0px 20px rgba(128, 0, 0, .9);border-color:#f00;color:#f00}textarea.ng-valid.ng-dirty,input.ng-valid.ng-dirty{box-shadow:0px 0px 20px rgba(0, 203, 0, .3);border-color:#090}@media ( max-width : 767px){.pull-right-xs{float:right}}@media ( min-width : 768px) and (max-width: 991px){.pull-right-xs{float:right}.pull-right-sm{float:right}}@media ( min-width : 992px) and (max-width: 1199px){.pull-right-xs{float:right}.pull-right-sm{float:right}.pull-right-md{float:right}}@media ( min-width : 1200px){.pull-right-xs{float:right}.pull-right-sm{float:right}.pull-right-md{float:right}.pull-right-lg{float:right}}#page-loading{padding-top:50px;width:100%;margin:0 auto;text-align:center;width:100%}#page-loading img{margin:0 auto}strong.indicator{font-weight:600;color:#f00}footer{border-top:solid 1px #ddd}nav.navbar{border:0;border-top:solid 1px #ccc;border-radius:0;margin:0}.nav-justified>li>a,.nav-justified>li.active>a{border:0;border-bottom:solid 1px #ddd !important}.nav-justified>li.active>a{background-color:#eee}nav .nav,footer nav .nav li{margin:0}.headliner{border-bottom:solid 1px #ccc}.headliner img{margin:0 auto;margin-top:10px;margin-bottom:20px}footer{border-top:solid 1px #ccc;background-color:#fff !important;color:#3b0084 !important;padding-top:10px;padding-bottom:50px}footer.app-footer p{line-height:1.4em}@media ( max-width : 768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{border-bottom:1px solid #ddd !important;border-radius:6px 6px 0 0 !important;margin-bottom:0 !important}.nav-justified>li.active>a{border-bottom:1px solid transparent !important}}.table-striped tbody>tr:nth-child(even)>td,.table-striped tbody>tr:nth-child(even)>th{background-color:#f1f1f1}.form-control.disabled{color:#ddd}.btn-group button.btn{border-radius:0px}.btn-group button.btn:first-child{border-radius:6px 0 0 6px}.btn-group button.btn:last-child{border-radius:0 6px 6px 0}.tab-pane{padding-top:10px;padding-bottom:20px}cover{position:absolute;top:0;bottom:0;left:0;right:0}.covered{position:relative}.covered img{display:none}.snapshot-container{margin-bottom:20px}.location-container,.nextsun-container{margin:auto;width:60%;min-width:350px;padding-left:10px;padding-right:10px;padding-bottom:10px;padding-top:5px;border:solid 1px #ccc;background-color:#eee;border-radius:10px;margin-bottom:20px}.nextsun-container{padding-top:20px;padding-bottom:20px;font-weight:500;font-size:18pt;text-transform:capitalize}.colour-container,.trigger-container,.sensor-container{text-align:center;vertical-align:top;margin-bottom:10px}.colour-holder,.trigger-holder,.sensor-holder{display:inline-block;margin:0 auto;width:80px;padding-left:10px;padding-right:10px;padding-bottom:10px;padding-top:5px;margin-right:5px}.sensor-holder{width:120px;border:solid 1px #ccc;border-radius:10px;margin-bottom:10px}.demand-holder{margin-left:5px;margin-right:3px}.sensor-holder .name{color:#333}.alarm-holder.alarm-never{background-color:#cfc;color:#999}.alarm-holder.alarm-yes{background-color:#fc9;color:#666}.alarm-holder.alarm-now{border-color:#000;background-color:#c00;color:#ccc;background-color:#c00}.sensor-holder.light-moon .name{color:#fff}.sensor-holder.light-sun .name{color:#333}.sensor-holder.state-alarm .name{color:#fff}.sensor-holder.state-normal .name{color:#333}.sensor-holder.light-moon{background-color:#003;color:#aaa}.sensor-holder.light-sun{background-color:#fc9;color:#666}.sensor-holder.state-alarm{border-color:#000;background-color:#c00;color:#ccc;background-color:#c00}.sensor-holder.state-normal{background-color:#cfc;color:#999}.sensor-holder.state-disabled,.sensor-holder.state-disabled .name,.trigger-holder.state-disabled{background-color:#dadada;color:#aaa}.trigger-holder{width:80px;border:solid 1px #ccc;border-radius:10px;margin-bottom:10px}.trigger-holder.state-on{background-color:#0c0;color:#fff}.trigger-holder.state-off{background-color:#030;color:#999}.chart-container{position:relative}@charset "UTF-8";#snackbar{visibility:hidden;min-width:250px;margin-left:-125px;background-color:#333;color:#fff;text-align:center;border-radius:3px;padding:16px;position:fixed;z-index:1;left:50%;bottom:30px}#snackbar.show{visibility:visible;-webkit-animation:fadein 0.5s, fadeout 0.5s 2.5s;animation:fadein 0.5s, fadeout 0.5s 2.5s}@-webkit-keyframes "fadein"{from{bottom:0;opacity:0;}to{bottom:30px;opacity:1;}}@keyframes "fadein"{from{bottom:0;opacity:0;}to{bottom:30px;opacity:1;}}@-webkit-keyframes "fadeout"{from{bottom:30px;opacity:1;}to{bottom:0;opacity:0;}}@keyframes "fadeout"{from{bottom:30px;opacity:1;}to{bottom:0;opacity:0;}} \ No newline at end of file +body{font-family:'Lato', sans-serif;font-weight:400;line-height:1.6;font-size:16px;color:#999}p{margin-bottom:1em}strong{font-weight:700;color:#666}blockquote{font-family:'Architects Daughter', cursive}textarea.text-input{font-family:Consolas, Monaco, Lucida Console, Liberation Mono, DejaVu Sans Mono, Bitstream Vera Sans Mono, Courier New, monospace}h1,h2,h3,h4{margin-top:30px;margin-bottom:20px;text-transform:none;color:#333}h1:first-of-type{margin-top:0px}h1,h2{font-weight:600}h3,h4{font-weight:400}h1{font-size:22px;text-transform:uppercase}h2{font-size:22px}h3{font-size:20px}h4{font-size:18px}p,li{margin-bottom:10px}li p{margin-bottom:0px}a{color:#3b0084}a:link,a:visited,a:link:active,a:visited:active{color:#3b0084;cursor:auto;font-weight:600}a:hover{color:#6000ff}pre{text-align:left}.container-fluid{padding:30px 10px}.close{line-height:1.4em}.bg-grey{background-color:#eee}footer.app-footer{background-color:#3b0084 !important;color:#fff !important}textarea.ng-invalid.ng-pristine,input.ng-invalid.ng-pristine{box-shadow:0px 0px 20px rgba(255, 164, 0, .3);border-color:#ccc}textarea.ng-invalid.ng-dirty,input.ng-invalid.ng-dirty{box-shadow:0px 0px 20px rgba(128, 0, 0, .9);border-color:#f00;color:#f00}textarea.ng-valid.ng-dirty,input.ng-valid.ng-dirty{box-shadow:0px 0px 20px rgba(0, 203, 0, .3);border-color:#090}@media ( max-width : 767px){.pull-right-xs{float:right}}@media ( min-width : 768px) and (max-width: 991px){.pull-right-xs{float:right}.pull-right-sm{float:right}}@media ( min-width : 992px) and (max-width: 1199px){.pull-right-xs{float:right}.pull-right-sm{float:right}.pull-right-md{float:right}}@media ( min-width : 1200px){.pull-right-xs{float:right}.pull-right-sm{float:right}.pull-right-md{float:right}.pull-right-lg{float:right}}#page-loading{padding-top:50px;width:100%;margin:0 auto;text-align:center;width:100%}#page-loading img{margin:0 auto}strong.indicator{font-weight:600;color:#f00}footer{border-top:solid 1px #ddd}nav.navbar{border:0;border-top:solid 1px #ccc;border-radius:0;margin:0}.nav-justified>li>a,.nav-justified>li.active>a{border:0;border-bottom:solid 1px #ddd !important}.nav-justified>li.active>a{background-color:#eee}nav .nav,footer nav .nav li{margin:0}.headliner{border-bottom:solid 1px #ccc}.headliner img{margin:0 auto;margin-top:10px;margin-bottom:20px}footer{border-top:solid 1px #ccc;background-color:#fff !important;color:#3b0084 !important;padding-top:10px;padding-bottom:50px}footer.app-footer p{line-height:1.4em}@media ( max-width : 768px){.nav-justified>li{display:table-cell;width:1%}.nav-justified>li>a{border-bottom:1px solid #ddd !important;border-radius:6px 6px 0 0 !important;margin-bottom:0 !important}.nav-justified>li.active>a{border-bottom:1px solid transparent !important}}.table-striped tbody>tr:nth-child(even)>td,.table-striped tbody>tr:nth-child(even)>th{background-color:#f1f1f1}.form-control.disabled{color:#ddd}.btn-group button.btn{border-radius:0px}.btn-group button.btn:first-child{border-radius:6px 0 0 6px}.btn-group button.btn:last-child{border-radius:0 6px 6px 0}.tab-pane{padding-top:10px;padding-bottom:20px}cover{position:absolute;top:0;bottom:0;left:0;right:0}.covered{position:relative}.covered img{display:none}.snapshot-container{margin-bottom:20px}.location-container,.nextsun-container{margin:auto;width:60%;min-width:350px;padding-left:10px;padding-right:10px;padding-bottom:10px;padding-top:5px;border:solid 1px #ccc;background-color:#eee;border-radius:10px;margin-bottom:20px}.nextsun-container{padding-top:20px;padding-bottom:20px;font-weight:500;font-size:18pt;text-transform:capitalize}.colour-container,.trigger-container,.sensor-container,.alarm-holder{text-align:center;vertical-align:top;margin-bottom:10px}.colour-holder,.trigger-holder,.sensor-holder,.alarm-holder{display:inline-block;margin:0 auto;width:80px;padding-left:10px;padding-right:10px;padding-bottom:10px;padding-top:5px;margin-right:5px}.sensor-holder,.alarm-holder{width:120px;border:solid 1px #ccc;border-radius:10px;margin-bottom:10px}.demand-holder{margin-left:5px;margin-right:3px}.sensor-holder .name{color:#333}.alarm-holder.alarm-never{background-color:#cfc;color:#999}.alarm-holder.alarm-yes{background-color:#fc9;color:#666}.alarm-holder.alarm-now{border-color:#000;color:#ccc;background-color:#c00}.sensor-holder.light-moon .name{color:#fff}.sensor-holder.light-sun .name{color:#333}.sensor-holder.state-alarm .name{color:#fff}.sensor-holder.state-normal .name{color:#333}.sensor-holder.light-moon{background-color:#003;color:#aaa}.sensor-holder.light-sun{background-color:#fc9;color:#666}.sensor-holder.state-alarm{border-color:#000;background-color:#c00;color:#ccc;background-color:#c00}.sensor-holder.state-normal{background-color:#cfc;color:#999}.sensor-holder.state-disabled,.sensor-holder.state-disabled .name,.trigger-holder.state-disabled{background-color:#dadada;color:#aaa}.trigger-holder{width:80px;border:solid 1px #ccc;border-radius:10px;margin-bottom:10px}.trigger-holder.state-on{background-color:#0c0;color:#fff}.trigger-holder.state-off{background-color:#030;color:#999}.chart-container{position:relative}@charset "UTF-8";#snackbar{visibility:hidden;min-width:250px;margin-left:-125px;background-color:#333;color:#fff;text-align:center;border-radius:3px;padding:16px;position:fixed;z-index:1;left:50%;bottom:30px}#snackbar.show{visibility:visible;-webkit-animation:fadein 0.5s, fadeout 0.5s 2.5s;animation:fadein 0.5s, fadeout 0.5s 2.5s}@-webkit-keyframes "fadein"{from{bottom:0;opacity:0;}to{bottom:30px;opacity:1;}}@keyframes "fadein"{from{bottom:0;opacity:0;}to{bottom:30px;opacity:1;}}@-webkit-keyframes "fadeout"{from{bottom:30px;opacity:1;}to{bottom:0;opacity:0;}}@keyframes "fadeout"{from{bottom:30px;opacity:1;}to{bottom:0;opacity:0;}} \ No newline at end of file diff --git a/css/raw/app.css b/css/raw/app.css index 665726e..7cce78b 100644 --- a/css/raw/app.css +++ b/css/raw/app.css @@ -326,13 +326,13 @@ cover { text-transform: capitalize; } -.colour-container, .trigger-container, .sensor-container { +.colour-container, .trigger-container, .sensor-container, .alarm-holder { text-align: center; vertical-align: top; margin-bottom: 10px; } -.colour-holder, .trigger-holder, .sensor-holder { +.colour-holder, .trigger-holder, .sensor-holder, .alarm-holder { display: inline-block; margin: 0 auto; width: 80px; @@ -343,7 +343,7 @@ cover { margin-right: 5px; } -.sensor-holder { +.sensor-holder, .alarm-holder { width: 120px; border: solid 1px #ccc; border-radius: 10px; @@ -371,7 +371,6 @@ cover { .alarm-holder.alarm-now { border-color: #000; - background-color: #c00; color: #ccc; background-color: #c00; } @@ -437,4 +436,4 @@ cover { } .chart-container { position: relative; -} \ No newline at end of file +} diff --git a/pages/home.php b/pages/home.php index 4e34fb9..5f92a9d 100644 --- a/pages/home.php +++ b/pages/home.php @@ -152,17 +152,17 @@ function getSensorData($env) {
-
-
+
+
FREQ
-
+
TEMP
-
+
THROT
-
+
VOLT
@@ -197,4 +197,4 @@ function getSensorData($env) {
- \ No newline at end of file +