diff options
| author | Pliable Pixels <pliablepixels@gmail.com> | 2017-03-28 12:45:44 -0400 |
|---|---|---|
| committer | Pliable Pixels <pliablepixels@gmail.com> | 2017-03-28 12:45:44 -0400 |
| commit | 8f8afb27d95669787bf0e7050670b702913bbf60 (patch) | |
| tree | 2ccb65e7725600aa474dab845d03307f3e31696e | |
| parent | 915ee6f72dff727e269561c6dcb8f24f7010c5fe (diff) | |
#505 - sizes now change at 5% intervals
| -rw-r--r-- | www/css/style.css | 41 | ||||
| -rw-r--r-- | www/js/MontageCtrl.js | 4 | ||||
| -rw-r--r-- | www/templates/montage.html | 2 |
3 files changed, 43 insertions, 4 deletions
diff --git a/www/css/style.css b/www/css/style.css index 3383e3fd..788f27f5 100644 --- a/www/css/style.css +++ b/www/css/style.css @@ -918,49 +918,88 @@ videogular div.event-time { } .grid-sizer { - width: 10%; + width: 5%; } .grid-item { width: 20%; } +.grid-item-5 { + width: 5%; +} .grid-item-10 { width: 10%; } +.grid-item-15 { + width: 15%; +} + + .grid-item-20 { width: 20%; } +.grid-item-25 { + width: 25%; +} + .grid-item-30 { width: 30%; } +.grid-item-35 { + width: 35%; +} + .grid-item-40 { width: 40%; } +.grid-item-45 { + width: 45%; +} + .grid-item-50 { width: 50%; } +.grid-item-55 { + width: 55%; +} + .grid-item-60 { width: 60%; } +.grid-item-65 { + width: 65%; +} + .grid-item-70 { width: 70%; } +.grid-item-75 { + width: 75%; +} .grid-item-80 { width: 80%; } +.grid-item-85 { + width: 85%; +} + .grid-item-90 { width: 90%; } +.grid-item-95 { + width: 95%; +} + .grid-item-100 { width: 100%; } diff --git a/www/js/MontageCtrl.js b/www/js/MontageCtrl.js index d8a90baf..1c68d6e9 100644 --- a/www/js/MontageCtrl.js +++ b/www/js/MontageCtrl.js @@ -1740,7 +1740,7 @@ angular.module('zmApp.controllers') { var curVal = parseInt($scope.MontageMonitors[i].Monitor.gridScale); - curVal = curVal + (10 * dirn); + curVal = curVal + (5 * dirn); if (curVal < 10) curVal = 10; if (curVal > 100) curVal = 100; //console.log ("For Index: " + i + " From: " + $scope.MontageMonitors[i].Monitor.gridScale + " To: " + curVal); @@ -1770,7 +1770,7 @@ angular.module('zmApp.controllers') for (i = 0; i < $scope.MontageMonitors.length; i++) { var cv = parseInt($scope.MontageMonitors[i].Monitor.gridScale); - cv = cv + (10 * dirn); + cv = cv + (5 * dirn); if (cv < 10) cv = 10; if (cv > 100) cv = 100; $scope.MontageMonitors[i].Monitor.gridScale = cv; diff --git a/www/templates/montage.html b/www/templates/montage.html index 4c171060..5d9de3cd 100644 --- a/www/templates/montage.html +++ b/www/templates/montage.html @@ -85,7 +85,7 @@ </div> <!-- now lets draw the montage windows --> <div class="grid" id="mygrid"> - <div class="grid-sizer grid-item-10"></div> + <div class="grid-sizer grid-item-5"></div> <!-- <span ng-repeat="monitor in MontageMonitors|limitTo: monLimit" ng-if="monitor.Monitor.Function!='None' && monitor.Monitor.Enabled !='0' ">--> <span ng-repeat="monitor in MontageMonitors | onlyEnabled |limitTo: monLimit"> |
