diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html
index ee17de1..ed208c2 100644
--- a/hourglass/client/main/main.html
+++ b/hourglass/client/main/main.html
@@ -297,7 +297,7 @@
Description:
-
+
.
{{restrict 'wDescription'}}
diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js
index c994e4e..ae2ddac 100644
--- a/hourglass/client/main/main.js
+++ b/hourglass/client/main/main.js
@@ -73,21 +73,25 @@ Template.classesMode.rendered = function() {
$(".mainClass .slimScrollBar").css("display", "none");
// Classes mode drag scrolling
- var dX = 0;
- var currX = 0;
- var sidebar = $("#classesMode");
- new Hammer(sidebar[0], {
- domEvents: true
+ var area = $("#classesMode");
+ var curDown;
+ var curXPos;
+
+ area.mousedown(function(m){
+ curDown = true;
+ curXPos = m.pageX;
});
- sidebar.on('panmove', function(e) {
- dX = currX + (e.originalEvent.gesture.deltaX);
- sidebar.scrollLeft(dX);
+ area.mouseup(function(){
+ curDown = false;
+ });
+
+ area.mousemove(function(m){
+ if(curDown) {
+ area.scrollLeft($(window).scrollLeft() + (curXPos - m.pageX));
+ }
});
- sidebar.on('panend', function(e) {
- currX = dX;
- });
};
// Global Helpers
diff --git a/hourglass/client/mobile/mobile.css b/hourglass/client/mobile/mobile.css
index 5f8423d..2fad0cd 100644
--- a/hourglass/client/mobile/mobile.css
+++ b/hourglass/client/mobile/mobile.css
@@ -489,6 +489,15 @@
right: 21vw;
}
+#mDelete {
+ padding: 3%;
+ background-color: rgba(255,255,255,0.1);
+
+ position: absolute;
+ bottom: 7vw;
+ left: 7vw;
+}
+
.mOption {
font-size: 3.7vw;
width: 92%;
diff --git a/hourglass/client/mobile/mobile.html b/hourglass/client/mobile/mobile.html
index ebc9bcb..c4109a3 100644
--- a/hourglass/client/mobile/mobile.html
+++ b/hourglass/client/mobile/mobile.html
@@ -224,6 +224,7 @@
{{work 'reports'}}
+
diff --git a/hourglass/client/mobile/mobile.js b/hourglass/client/mobile/mobile.js
index a354595..5868a92 100644
--- a/hourglass/client/mobile/mobile.js
+++ b/hourglass/client/mobile/mobile.js
@@ -488,6 +488,10 @@ Template.mEditWork.rendered = function() {
Session.set("select", "type");
toggleSidebar(true);
});
+
+ /*addMobileButton($("#mDelete"), 0.2, "brightness", function() {
+
+ })*/
}
Template.mAddWork.events({