Optimize height of temperature graph and add max-height

BillyBlaze · Oct 31, 2015 · 1b0cbba · 1b0cbba
1 parent 7e1049f
commit 1b0cbba
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 25 deletions.
diff --git a/octoprint_touchui/static/css/touchui.css b/octoprint_touchui/static/css/touchui.css
diff --git a/octoprint_touchui/static/js/includes/files.js b/octoprint_touchui/static/js/includes/files.js
@@ -3,23 +3,6 @@
 	$.fn.TouchUI.files = {
 		init: function() {
 			var self = this;
-
-			if( !this.isTouch ) {
-				// Refresh body on dropdown click
-				$(document).on("click", ".container .dropdown-menu li a", function() {
-					setTimeout(function() {
-						self.scroll.iScrolls.body.refresh();
-					}, 0);
-				});
-
-				// Refresh body and scroll to previous element
-				$(document).on("click", ".container .pagination ul li a", function(e) {
-					setTimeout(function() {
-						self.scroll.iScrolls.body.refresh();
-					}, 0);
-				});
-			}
-
 			this.files.touchList();
 		},
 

diff --git a/octoprint_touchui/static/js/includes/scroll.js b/octoprint_touchui/static/js/includes/scroll.js
@@ -30,11 +30,10 @@
 
 		},
 
-		// Add scrolling with mousedown if there is no touch
 		init: function() {
 			var self = this;
 
-			if (this.isTouch) {
+			if ( this.isTouch ) {
 
 				// Covert VH to the initial height (prevent height from jumping when navigation bar hides/shows)
 				$("#temperature-graph").height($("#temperature-graph").outerHeight());
@@ -56,6 +55,13 @@
 				self.scroll.body.init.call(self);
 				self.scroll.modal.init.call(self);
 
+				// Refresh body on dropdown click
+				$(document).on("click", ".container .pagination ul li a", function() {
+					setTimeout(function() {
+						self.scroll.currentActive.refresh();
+					}, 0);
+				});
+
 			}
 
 			self.scroll.dropdown.init.call(self);
@@ -162,9 +168,11 @@
 
 						// Refresh current scroll
 						if ( !self.isTouch ) {
-							var translateY = parseFloat($('.page-container').css("transform").split(",")[5].replace("-",""));
-							$('.octoprint-container').css("min-height", $dropdownToggle.next().outerHeight() + $dropdownToggle.next().offset().top + translateY);
-							self.scroll.currentActive.refresh();
+							setTimeout(function() {
+								var translateY = parseFloat($('.page-container').css("transform").split(",")[5].replace("-",""));
+								$('.octoprint-container').css("min-height", $dropdownToggle.next().outerHeight() + $dropdownToggle.next().offset().top + translateY);
+								self.scroll.currentActive.refresh();
+							}, 0);
 						}
 
 						// Skip everything if we are in the main dropdown toggle dropdowns

diff --git a/octoprint_touchui/static/less/tabs/temperature.less b/octoprint_touchui/static/less/tabs/temperature.less
@@ -6,7 +6,8 @@
 	#temperature-graph {
 		position: relative;
 		margin-bottom: 10px;
-		height: 85vh;
+		height: 60vh;
+		max-height: 300px;
 		background-size: contain;
 		.box-sizing(border-box);
 
@@ -50,7 +51,7 @@
 	}
 	.row-fluid {
 		width: 161vw !important;
-		margin: 20px 0 40px 0 !important;
+		margin: 0 0 20px 0 !important;
 		transition: left 0.5s ease;
 		cursor: w-resize;
 		position: relative;