From f9a8733207a558bcd0ace7c0746f596660f89dbf Mon Sep 17 00:00:00 2001 From: Greg Westneat Date: Tue, 12 Sep 2017 03:58:03 -0700 Subject: [PATCH] 1.8.0 --- README.markdown | 8 ++++++-- component.json | 2 +- package.json | 4 ++-- slick.jquery.json | 2 +- slick/slick.js | 2 +- slick/slick.min.js | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/README.markdown b/README.markdown index 2cd220023..c3835ba5f 100644 --- a/README.markdown +++ b/README.markdown @@ -21,16 +21,20 @@ to serve the files as close, and fast as possible to your users: Just add a link to the css file in your ``: +<<<<<<< HEAD ```html +======= + +>>>>>>> 1.7.2 - + ``` Then, before your closing `````` tag add: ```html - + ``` #### Package Managers diff --git a/component.json b/component.json index bddac18af..4b71b23ab 100644 --- a/component.json +++ b/component.json @@ -2,7 +2,7 @@ "name": "slick", "repo": "kenwheeler/slick", "description": "the last carousel you'll ever need", - "version": "1.7.1", + "version": "1.8.0", "keywords": ["ui", "jquery", "carousel", "responsive", "slider"], "dependencies": { "component/jquery": "*" diff --git a/package.json b/package.json index b04923e71..01d1f9288 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "slick-carousel", - "version": "1.7.1", + "version": "1.8.0", "description": "the last carousel you'll ever need", "main": "slick/slick.js", "repository": { @@ -39,6 +39,6 @@ "url": "https://github.com/kenwheeler/slick/issues" }, "peerDependencies": { - "jquery": ">=1.7.2" + "jquery": ">=1.8.0" } } diff --git a/slick.jquery.json b/slick.jquery.json index 00308b27f..89c9e11e2 100644 --- a/slick.jquery.json +++ b/slick.jquery.json @@ -9,7 +9,7 @@ "touch", "mobile" ], - "version": "1.7.1", + "version": "1.8.0", "author": { "name": "Ken Wheeler", "url": "http://kenwheeler.github.io" diff --git a/slick/slick.js b/slick/slick.js index 81b9e0d1c..952998965 100644 --- a/slick/slick.js +++ b/slick/slick.js @@ -6,7 +6,7 @@ |___/_|_|\___|_|\_(_)/ |___/ |__/ - Version: 1.7.1 + Version: 1.8.0 Author: Ken Wheeler Website: http://kenwheeler.github.io Docs: http://kenwheeler.github.io/slick diff --git a/slick/slick.min.js b/slick/slick.min.js index 1dcaee64d..42172c2f6 100644 --- a/slick/slick.min.js +++ b/slick/slick.min.js @@ -1 +1 @@ -!function(i){"use strict";"function"==typeof define&&define.amd?define(["jquery"],i):"undefined"!=typeof exports?module.exports=i(require("jquery")):i(jQuery)}(function(i){"use strict";var e=window.Slick||{};(e=function(){var e=0;return function(t,o){var s,n=this;n.defaults={accessibility:!0,adaptiveHeight:!1,appendArrows:i(t),appendDots:i(t),arrows:!0,asNavFor:null,prevArrow:'',nextArrow:'',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i('',nextArrow:'',autoplay:!1,autoplaySpeed:3e3,centerMode:!1,centerPadding:"50px",cssEase:"ease",customPaging:function(e,t){return i('