resolve CSS/other compliancy notes

5 files changed, 37 insertions, 21 deletions

diff --git a/www/css/style.css b/www/css/style.css
index d4513b80..f2cea26c 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -153,10 +153,10 @@ Credit: https://css-tricks.com/snippets/css/a-guide-to-flexbox/
     flex-wrap: wrap;
 }
 
-.wrapper > * {
-    /*padding: 5px;*/
-    /*flex: 1 100%; -- I commented this out - the wrapper was taking up full width in Chrome*/
-}
+/*.wrapper > * {
+    padding: 5px;
+    flex: 1 100%; -- I commented this out - the wrapper was taking up full width in Chrome
+}*/
 
 .header {
     background: #333333;
@@ -210,6 +210,7 @@ Credit: https://css-tricks.com/snippets/css/a-guide-to-flexbox/
 
 #slowpulse {
     -webkit-animation-duration: 1500ms;
+    animation-duration: 1500ms;
 }
 
 .alarmed-body {
@@ -403,6 +404,8 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */
     -webkit-transform: rotate(-90deg) translateY(-1000%);
     -webkit-transform-origin: 100% 0%;
     -moz-transform: rotate(-90deg);
+    transform:rotate(-90deg) translateY(-1000%);
+    transform-origin: 100% 0%;
     top: 50%;
     margin-top: -50px;
     left: 100%;
@@ -666,7 +669,7 @@ progress[role]
 
 {
     /* Turns off styling - not usually needed, but good to know. */
-    appearance: none;
+    /* appearance: none;*/
     -moz-appearance: none;
     -webkit-appearance: none;
     /* gets rid of default border in Firefox and Opera. */
@@ -895,6 +898,7 @@ input[type=range]::-webkit-slider-thumb {
 
 .eventDeleteSpeed {
     -webkit-animation-duration: 300ms;
+    animation-duration: 300ms;
 }
 
 .content-banner.alarm {
@@ -969,22 +973,28 @@ videogular div.event-time {
 
 #full-screen-event {
     -webkit-animation-duration: 200ms;
+    animation-duration: 200ms;
 }
 
 #monitorimage {
     -webkit-animation-duration: 200ms;
+    animation-duration: 200ms;
 }
 
 #firstuse {
     -webkit-animation-delay: 1s;
+    animation-delay: 1s;
+
 }
 
 #transition-delay {
     -webkit-animation-delay: 1s;
+    animation-delay: 1s;
 }
 
 #really-your-fault {
     -webkit-animation-delay: 4s;
+    animation-delay: 4s;
 }
 
 
@@ -1190,16 +1200,20 @@ videogular div.event-time {
     /*background: rgba(192, 57, 43, 0.7);*/
     background: rgba(108, 122, 137, 0.7);
     -webkit-border-radius: 5px 0 0 5px;
+    border-radius: 5px 0 0 5px;
 }
 
 #flyoutmenu li:only-child {
     /*background: rgba(192, 57, 43, 0.7);*/
     background: rgba(108, 122, 137, 0.7);
     -webkit-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
+
 }
 
 #flyoutmenu li:last-child {
     -webkit-border-radius: 0 5px 5px 0;
+    border-radius: 0 5px 5px 0;
 }
 
 
@@ -1212,6 +1226,7 @@ videogular div.event-time {
     
     background: rgba(108, 122, 137, 0.7);
     -webkit-border-radius: 5px 5px 5px 5px;
+    border-radius: 5px 5px 5px 5px;
 }
 
 #flyoutmenu li:nth-child(n+2) {
diff --git a/www/js/MonitorModalCtrl.js b/www/js/MonitorModalCtrl.js
index 51f08fd5..b5bfdd92 100644
--- a/www/js/MonitorModalCtrl.js
+++ b/www/js/MonitorModalCtrl.js
@@ -1016,26 +1016,26 @@ angular.module('zmApp.controllers').controller('MonitorModalCtrl', ['$scope', '$
     var color = "";
     switch ($scope.monStatus) {
       case "":
-        color = "background-color:none";
+        color = "none";
         break;
       case status[0]:
-        color = "background-color:#4B77BE";
+        color = "#4B77BE";
         break;
       case status[1]:
-        color = "background-color:#e67e22";
+        color = "#e67e22";
         break;
       case status[2]:
-        color = "background-color:#D91E18";
+        color = "#D91E18";
         break;
       case status[3]:
-        color = "background-color:#e67e22";
+        color = "#e67e22";
         break;
       case status[4]:
-        color = "background-color:#26A65B";
+        color = "#26A65B";
         break;
     }
 
-    return "padding-left:4px;padding-right:4px;" + color;
+    return color;
   };
 
   //-----------------------------------------------------------------------
diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js
index 02128ebc..70baec5b 100644
--- a/www/js/MontageCtrl.js
+++ b/www/js/MontageCtrl.js
@@ -508,6 +508,7 @@ angular.module('zmApp.controllers')
         (NVRDataModel.getBandwidth() == 'lowbw') ||
         (NVRDataModel.getLogin().disableAlarmCheckMontage == true)) {
 
+         // console.log ("NOT DOING ALARMS");
         return;
       }
 
@@ -540,19 +541,19 @@ angular.module('zmApp.controllers')
             var sid = parseInt(data.data.status);
             switch (sid) {
               case 0: // idle
-                monitor.Monitor.alarmState = 'color:rgba(0,0,0,0);';
+                monitor.Monitor.alarmState = 'rgba(0,0,0,0)';
                 break;
               case 1: // pre alarm
-                monitor.Monitor.alarmState = 'color:#e67e22;';
+                monitor.Monitor.alarmState = '#e67e22';
                 break;
               case 2: // alarm
-                monitor.Monitor.alarmState = 'color:#D91E18;';
+                monitor.Monitor.alarmState = '#D91E18';
                 break;
               case 3: // alert
-                monitor.Monitor.alarmState = 'color:#e67e22;';
+                monitor.Monitor.alarmState = '#e67e22';
                 break;
               case 4:
-                monitor.Monitor.alarmState = 'color:#26A65B;';
+                monitor.Monitor.alarmState = '#26A65B';
                 break;
 
             }
@@ -560,7 +561,7 @@ angular.module('zmApp.controllers')
           },
           function (error) {
 
-            monitor.Monitor.alarmState = 'color:rgba(0,0,0,0);';
+            monitor.Monitor.alarmState = 'rgba(0,0,0,0)';
             NVRDataModel.debug("Error in monitor alarmed status ");
           });
     }
@@ -1847,7 +1848,7 @@ angular.module('zmApp.controllers')
       for (var i = 0; i < $scope.MontageMonitors.length; i++) {
         $scope.MontageMonitors[i].Monitor.gridScale = "50";
         $scope.MontageMonitors[i].Monitor.selectStyle = "";
-        $scope.MontageMonitors[i].Monitor.alarmState = 'color:rgba(0,0,0,0);';
+        $scope.MontageMonitors[i].Monitor.alarmState = 'rgba(0,0,0,0)';
         $scope.MontageMonitors[i].Monitor.isStamp = false;
 
       }
diff --git a/www/templates/monitors-modal.html b/www/templates/monitors-modal.html
index 02b46a37..86407756 100644
--- a/www/templates/monitors-modal.html
+++ b/www/templates/monitors-modal.html
@@ -202,6 +202,6 @@
     </ul>
   </div>
   <div ng-if="!showPTZ" class="monitor-modal-text">{{monitorName}} &nbsp;
-    <span style="{{stateColor()}}">{{monStatus}}&nbsp;</span>
+    <span ng-style="{'background-color':stateColor()}">&nbsp;{{monStatus}}&nbsp;</span>
   </div>
 </div>
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 90a3bc23..5952ad9e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -118,7 +118,7 @@
                             <figcaption id="slowpulse" ng-class="monitor.Monitor.isAlarmed==true?'alarmed-figcaption animated infinite flash':'normal-figcaption'" >&nbsp;
                                 
                                     <span ng-if="monitor.Monitor.isStamp && isDragabillyOn"><i  class="animated infinite flash ion-pin"></i>&nbsp;</span><i class="ion-ios-videocam"></i>&nbsp;
-                                   {{monitor.Monitor.Name}}&nbsp;<i ng-if="$root.runMode!='lowbw'" style="{{monitor.Monitor.alarmState}}" class="ion-record"></i>&nbsp;
+                                   {{monitor.Monitor.Name}}&nbsp;<i ng-if="$root.runMode!='lowbw'" ng-style="{'color':monitor.Monitor.alarmState}" class="ion-record"></i>&nbsp;
 
                             </figcaption>