Skip to content

Commit 2a99865

Browse files
committed
Css updates..
1 parent 7deec8d commit 2a99865

File tree

7 files changed

+24
-22
lines changed

7 files changed

+24
-22
lines changed

demo/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta charset="utf-8">
66
<meta http-equiv="X-UA-Compatible" content="IE=edge">
77
<meta name="description" content="">
8-
<link rel="stylesheet" href="../dist/css/lightslider.min.css"/>
8+
<link rel="stylesheet" href="../src/css/lightslider.css"/>
99
<style>
1010
ul{
1111
list-style: none outside none;
@@ -29,7 +29,7 @@
2929
}
3030
</style>
3131
<script src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
32-
<script src="../dist/js/lightslider.min.js"></script>
32+
<script src="../src/js/lightslider.js"></script>
3333
<script>
3434
$(document).ready(function() {
3535
$("#content-slider").lightSlider({

dist/css/lightslider.css

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@
3535
-webkit-transition-property: -webkit-transform,height;
3636
-moz-transition-property: -moz-transform,height;
3737
transition-property: transform,height;
38-
-webkit-transition-duration: inherit;
39-
transition-duration: inherit;
40-
-webkit-transition-timing-function: inherit;
41-
transition-timing-function: inherit;
38+
-webkit-transition-duration: inherit !important;
39+
transition-duration: inherit !important;
40+
-webkit-transition-timing-function: inherit !important;
41+
transition-timing-function: inherit !important;
4242
}
4343
.lSSlideWrapper .lSFade {
4444
position: relative;
@@ -55,12 +55,12 @@
5555
opacity: 0;
5656
-webkit-transition-delay: 0s;
5757
transition-delay: 0s;
58-
-webkit-transition-duration: inherit;
59-
transition-duration: inherit;
58+
-webkit-transition-duration: inherit !important;
59+
transition-duration: inherit !important;
6060
-webkit-transition-property: opacity;
6161
transition-property: opacity;
62-
-webkit-transition-timing-function: inherit;
63-
transition-timing-function: inherit;
62+
-webkit-transition-timing-function: inherit !important;
63+
transition-timing-function: inherit !important;
6464
}
6565
.lSSlideWrapper .lSFade > *.active {
6666
z-index: 10;

dist/css/lightslider.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/js/lightslider.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,6 @@
647647
},
648648

649649
touchMove: function (endCoords, startCoords) {
650-
clearInterval(interval);
651650
$slide.css('transition-duration', '0ms');
652651
if (settings.mode === 'slide') {
653652
var distance = endCoords - startCoords;
@@ -758,6 +757,7 @@
758757
$slide.scrollLeft -= 1;
759758
// *
760759
$slide.find('.lightSlider').removeClass('lsGrab').addClass('lsGrabbing');
760+
clearInterval(interval);
761761
}
762762
});
763763
$(window).on('mousemove', function (e) {
@@ -804,6 +804,7 @@
804804
endCoords = e.originalEvent.targetTouches[0];
805805
startCoords.pageX = e.originalEvent.targetTouches[0].pageX;
806806
startCoords.pageY = e.originalEvent.targetTouches[0].pageY;
807+
clearInterval(interval);
807808
});
808809
$slide.on('touchmove', function (e) {
809810
if (w < elSize) {

0 commit comments

Comments
 (0)