Pull from master

2018-04-05 11:49:42 +06:30
parent 9bf4047548
commit fc8b2d3b73
14 changed files with 222 additions and 54 deletions
--- a/app/assets/javascripts/custom.js
+++ b/app/assets/javascripts/custom.js
@@ -32,6 +32,26 @@ $(document).ready(function() {
    railBorderRadius: '0',
    touchScrollStep : 50
  });
+
+  $('#modal-slimscroll').slimScroll({
+    height: height-$('#modal-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 45
+  });
+
+  $('#modal-set-slimscroll').slimScroll({
+    height: height-$('#modal-slimscroll').attr('data-height'),
+    size: '5px',
+    color: 'rgba(0,0,0,0.5)',
+    alwaysVisible: false,
+    borderRadius: '0',
+    railBorderRadius: '0',
+    touchScrollStep : 45
+  });
  
  // $('.delete').click(function(){
  //   var method    = $(this).attr('data-method');