Css updates..

sachinchoolur · Apr 5, 2015 · 2a99865 · 2a99865
1 parent 7deec8d
commit 2a99865
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 22 deletions.
diff --git a/demo/index.html b/demo/index.html
@@ -5,7 +5,7 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="description" content="">
-    <link rel="stylesheet"  href="../dist/css/lightslider.min.css"/>
+    <link rel="stylesheet"  href="../src/css/lightslider.css"/>
     <style>
     	ul{
 			list-style: none outside none;
@@ -29,7 +29,7 @@
 		}
     </style>
     <script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-    <script src="../dist/js/lightslider.min.js"></script> 
+    <script src="../src/js/lightslider.js"></script> 
     <script>
     	 $(document).ready(function() {
 			$("#content-slider").lightSlider({

diff --git a/dist/css/lightslider.css b/dist/css/lightslider.css
@@ -35,10 +35,10 @@
     -webkit-transition-property: -webkit-transform,height;
     -moz-transition-property: -moz-transform,height;
     transition-property: transform,height;
-    -webkit-transition-duration: inherit;
-    transition-duration: inherit;
-    -webkit-transition-timing-function: inherit;
-    transition-timing-function: inherit;
+    -webkit-transition-duration: inherit !important;
+    transition-duration: inherit !important;
+    -webkit-transition-timing-function: inherit !important;
+    transition-timing-function: inherit !important;
 }
 .lSSlideWrapper .lSFade {
     position: relative;
@@ -55,12 +55,12 @@
     opacity: 0;
     -webkit-transition-delay: 0s;
     transition-delay: 0s;
-    -webkit-transition-duration: inherit;
-    transition-duration: inherit;
+    -webkit-transition-duration: inherit !important;
+    transition-duration: inherit !important;
     -webkit-transition-property: opacity;
     transition-property: opacity;
-    -webkit-transition-timing-function: inherit;
-    transition-timing-function: inherit;
+    -webkit-transition-timing-function: inherit !important;
+    transition-timing-function: inherit !important;
 }
 .lSSlideWrapper .lSFade > *.active {
     z-index: 10;

diff --git a/dist/css/lightslider.min.css b/dist/css/lightslider.min.css
diff --git a/dist/js/lightslider.js b/dist/js/lightslider.js
@@ -647,7 +647,6 @@
             },
 
             touchMove: function (endCoords, startCoords) {
-                clearInterval(interval);
                 $slide.css('transition-duration', '0ms');
                 if (settings.mode === 'slide') {
                     var distance = endCoords - startCoords;
@@ -758,6 +757,7 @@
                             $slide.scrollLeft -= 1;
                             // *
                             $slide.find('.lightSlider').removeClass('lsGrab').addClass('lsGrabbing');
+                            clearInterval(interval);
                         }
                     });
                     $(window).on('mousemove', function (e) {
@@ -804,6 +804,7 @@
                         endCoords = e.originalEvent.targetTouches[0];
                         startCoords.pageX = e.originalEvent.targetTouches[0].pageX;
                         startCoords.pageY = e.originalEvent.targetTouches[0].pageY;
+                        clearInterval(interval);
                     });
                     $slide.on('touchmove', function (e) {
                         if (w < elSize) {