summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorPliable Pixels <pliablepixels@gmail.com>2019-04-11 15:56:22 -0400
committerPliable Pixels <pliablepixels@gmail.com>2019-04-11 15:56:22 -0400
commitbf5aefcd2069cfe94108e6cac29268769a1a28a9 (patch)
tree918ff6c6942d8ccbbacd66c3deebb04a29a6f366 /www
parentc2cab1526e4141d6ab5e5c7964e44c8d28f7b03b (diff)
#806 fluid class for image
Diffstat (limited to 'www')
-rw-r--r--www/css/style.css5
-rw-r--r--www/js/NVR.js2
-rw-r--r--www/templates/montage.html2
3 files changed, 7 insertions, 2 deletions
diff --git a/www/css/style.css b/www/css/style.css
index e688f152..d86c089a 100644
--- a/www/css/style.css
+++ b/www/css/style.css
@@ -555,6 +555,11 @@ http://www.cssportal.com/tryit/index.php?file=blog/css-notification-badge */
}
+.img-fluid {
+ max-width: 100%;
+ height: auto;
+ }
+
.screen-note {
position: absolute;
top:0;
diff --git a/www/js/NVR.js b/www/js/NVR.js
index 2f30df48..a2e518ba 100644
--- a/www/js/NVR.js
+++ b/www/js/NVR.js
@@ -20,7 +20,7 @@ angular.module('zmApp.controllers')
DO NOT TOUCH zmAppVersion
It is changed by sync_version.sh
*/
- var zmAppVersion = "1.3.056";
+ var zmAppVersion = "1.3.057";
var isBackground = false;
var justResumed = false;
var timeSinceResumed = -1;
diff --git a/www/templates/montage.html b/www/templates/montage.html
index 1df4e255..1d1e980e 100644
--- a/www/templates/montage.html
+++ b/www/templates/montage.html
@@ -163,7 +163,7 @@
style="background:rgba(10, 61, 98,0.3)">
<!--sidebar details-->
- <img style="height: 100%; width: 100%; object-fit: contain"
+ <img class="img-fluid"
image-spinner-src="{{constructEventThumbnail(monitor) }}" image-spinner-loader="lines"
img-spinner-w="{{monitor.Monitor.Width}}" img-spinner-h="{{monitor.Monitor.Height}}"
image-on-error="processImageError(monitor);" ng-click="showEvent(monitor)" />