Permalink
Browse files

fixes compatibility with bootstrap

  • Loading branch information...
Kevin Batdorf
Kevin Batdorf committed Jul 17, 2014
1 parent 7710a15 commit f08b1ba437a9fc9438714fe3068084028a1b71b7
Showing with 17 additions and 14 deletions.
  1. +1 −1 Gruntfile.js
  2. +3 −0 README.markdown
  3. +1 −1 bower.json
  4. +1 −1 css/liquid-slider.css
  5. +2 −2 js/jquery.liquid-slider.min.js
  6. +1 −1 liquidslider.jquery.json
  7. +1 −1 package.json
  8. +7 −7 src/js/jquery.liquid-slider.js
View
@@ -1,7 +1,7 @@
module.exports = function (grunt) {
grunt.initConfig({
- version: '2.3.6',
+ version: '2.3.7',
jshint: {
options: {
browser: true,
View
@@ -144,6 +144,9 @@ swipeArgs: undefined
Versions
--------
+Version 2.3.7
+- Fixes compatability with Bootstrap
+
Version 2.3.6
- Recalculates panel width based on container
- Minor CSS update
View
@@ -1,6 +1,6 @@
{
"name": "liquidslider",
- "version": "2.3.6",
+ "version": "2.3.7",
"homepage": "http://liquidslider.com",
"authors": [
"Kevin Batdorf <kevin@kevinbatdorf.com>"
View
@@ -58,7 +58,7 @@
}
/*** Panels ***/
-.liquid-slider .panel {
+.liquid-slider .ls-panel {
width: 600px;
display: block;
float: left;

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -11,7 +11,7 @@
"mobile",
"tabs"
],
- "version": "2.3.6",
+ "version": "2.3.7",
"author": {
"name": "Kevin Batdorf",
"url": "http://www.kevinbatdorf.com"
View
@@ -1,6 +1,6 @@
{
"name": "liquidslider",
- "version": "2.3.6",
+ "version": "2.3.7",
"description": "A Responsive Content Slider",
"main": "index.js",
"directories": {
@@ -183,7 +183,7 @@ LiquidSlider.build = function() {
_this.options.preloader && _this.addPreloader();
// Add the .panel class to the individual panels
- jQuery(_this.sliderId).children().addClass((_this.$elem).attr('id') + '-panel panel');
+ jQuery(_this.sliderId).children().addClass((_this.$elem).attr('id') + '-panel ls-panel');
_this.panelClass = _this.sliderId + ' .' + (_this.$elem).attr('id') + '-panel:not(.clone)';
_this.$panelClass = jQuery(_this.panelClass);
@@ -1115,16 +1115,16 @@ LiquidSlider.makeResponsive = function() {
// Adjust widths and add classes to make responsive
jQuery(_this.sliderId + '-wrapper').addClass('ls-responsive').css({
- 'max-width': jQuery(_this.sliderId + ' .panel:first-child').width(),
+ 'max-width': jQuery(_this.sliderId + ' .ls-panel:first-child').width(),
'width': '100%'
});
// Update widths
jQuery(_this.sliderId + ' .panel-container').css('width', 100 * _this.panelCountTotal + _this.pSign);
- jQuery(_this.sliderId + ' .panel').css('width', 100 / _this.panelCountTotal + _this.pSign);
+ jQuery(_this.sliderId + ' .ls-panel').css('width', 100 / _this.panelCountTotal + _this.pSign);
// convert to pixels
- jQuery(_this.sliderId + ' .panel').css('width', jQuery(_this.sliderId).outerWidth(true));
+ jQuery(_this.sliderId + ' .ls-panel').css('width', jQuery(_this.sliderId).outerWidth(true));
// Cache the padding for add/removing arrows
if (_this.options.hideArrowsWhenMobile) {
@@ -1142,7 +1142,7 @@ LiquidSlider.makeResponsive = function() {
var height = (_this.options.autoHeight) ? _this.getHeight() : _this.getHeighestPanel(_this.nextPanel);
_this.adjustHeight(false, height);
// convert to pixels
- jQuery(_this.sliderId + ' .panel').css('width', jQuery(_this.sliderId).outerWidth(true));
+ jQuery(_this.sliderId + ' .ls-panel').css('width', jQuery(_this.sliderId).outerWidth(true));
}, 500);
});
};
@@ -1198,7 +1198,7 @@ LiquidSlider.responsiveEvents = function() {
// While resizing, set the width to 100%
jQuery(_this.sliderId + '-wrapper').css('width', '100%');
- _this.loaded && jQuery(_this.sliderId + ' .panel').width(100 / _this.panelCountTotal + _this.pSign);
+ _this.loaded && jQuery(_this.sliderId + ' .ls-panel').width(100 / _this.panelCountTotal + _this.pSign);
// Update when the select box changes
_this.options.mobileNavigation &&
@@ -1219,5 +1219,5 @@ LiquidSlider.registerTouch = function() {
_this.swipeDir = (dir === 'left') ? 'right' : 'left';
_this.setNextPanel(_this.swipeDir);
}};
- jQuery(_this.sliderId + ' .panel').swipe(args);
+ jQuery(_this.sliderId + ' .ls-panel').swipe(args);
};

0 comments on commit f08b1ba

Please sign in to comment.