From 994a7f29735444dc8a9e3ca03f1c8de820150165 Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Sat, 31 Jan 2015 22:47:23 -0500 Subject: [PATCH] probably fixed html load error, probably fixed touchpad error --- chromebook-checkout-meteor/client/admin.js | 4 ++-- chromebook-checkout-meteor/client/checkout.js | 4 ++-- chromebook-checkout-meteor/client/chromebook.css | 1 + chromebook-checkout-meteor/client/teacher.js | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/chromebook-checkout-meteor/client/admin.js b/chromebook-checkout-meteor/client/admin.js index b186f4f..eb1f901 100644 --- a/chromebook-checkout-meteor/client/admin.js +++ b/chromebook-checkout-meteor/client/admin.js @@ -119,8 +119,8 @@ Template.admin.rendered = function() { $(".border.tabs-content").mCustomScrollbar({ theme: 'dark', scrollInertia: 0, - mouseWheelPixels: 40, - contentTouchScroll: 30 + mouseWheel: { deltaFactor: 40 }, + alwaysShowScrollbar: 2 }); } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/checkout.js b/chromebook-checkout-meteor/client/checkout.js index 509d686..18a6a1e 100644 --- a/chromebook-checkout-meteor/client/checkout.js +++ b/chromebook-checkout-meteor/client/checkout.js @@ -27,7 +27,7 @@ Template.checkout.rendered = function() { $(".chckChromebooks").mCustomScrollbar({ theme: 'dark', scrollInertia: 0, - mouseWheelPixels: 40, - contentTouchScroll: 30 + mouseWheel: { deltaFactor: 40 }, + alwaysShowScrollbar: 2 }); } \ No newline at end of file diff --git a/chromebook-checkout-meteor/client/chromebook.css b/chromebook-checkout-meteor/client/chromebook.css index bc126b8..7d865ab 100644 --- a/chromebook-checkout-meteor/client/chromebook.css +++ b/chromebook-checkout-meteor/client/chromebook.css @@ -17,6 +17,7 @@ body { color: #000000; height: 10%; max-width: 81%; + max-height: 10%; } .checkout, .teacher { diff --git a/chromebook-checkout-meteor/client/teacher.js b/chromebook-checkout-meteor/client/teacher.js index 06582e6..f3ae7ac 100644 --- a/chromebook-checkout-meteor/client/teacher.js +++ b/chromebook-checkout-meteor/client/teacher.js @@ -27,7 +27,7 @@ Template.teacher.rendered = function() { $(".tchChromebooks").mCustomScrollbar({ theme: 'dark', scrollInertia: 0, - mouseWheelPixels: 40, - contentTouchScroll: 30 + mouseWheel: { deltaFactor: 40 }, + alwaysShowScrollbar: 2 }); }