Skip to content

Commit 4dbc8af

Browse files
authored
Merge branch 'master' into fix/woff2
2 parents e014f88 + ba81d08 commit 4dbc8af

File tree

7 files changed

+10
-7
lines changed

7 files changed

+10
-7
lines changed

CONTRIBUTING.markdown

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ You must provide a clear and simple way to reproduce the issue with the provided
1717

1818
Although Slick is designed to be super easy to use, there's always things that can go wrong, especially when interacting with other plugins and complicated websites. If you are **having problems getting Slick to work**, or can't figure something out, **this repository**'s issues section **is not the place to ask about it**.
1919

20-
I have set up a subreddit for Slick discussion at [reddit.com/r/slickcarousel](http://www.reddit.com/r/slickcarousel/).
2120
And a gitter chatroom here: [gitter.im/kenwheeler/slick](https://gitter.im/kenwheeler/slick).
2221
And finally you can ask the world for help, and find out if anyone else has your problem at [stackoverflow](http://stackoverflow.com/search?q=slick+carousel).
2322

README.markdown

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ _the last carousel you'll ever need_
1111

1212
#### CDN
1313

14-
To start working with Slick right away, there's a couple of CDN choices availabile
14+
To start working with Slick right away, there's a couple of CDN choices available
1515
to serve the files as close, and fast as possible to your users:
1616

1717
- https://cdnjs.com/libraries/slick-carousel
@@ -23,15 +23,15 @@ Just add a link to the css file in your `<head>`:
2323

2424
```html
2525
<!-- Add the slick-theme.css if you want default styling -->
26-
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/[email protected]/slick/slick.css"/>
26+
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/[email protected]/slick/slick.css"/>
2727
<!-- Add the slick-theme.css if you want default styling -->
28-
<link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/[email protected]/slick/slick-theme.css"/>
28+
<link rel="stylesheet" type="text/css" href="https://cdn.jsdelivr.net/npm/[email protected]/slick/slick-theme.css"/>
2929
```
3030

3131
Then, before your closing ```<body>``` tag add:
3232

3333
```html
34-
<script type="text/javascript" src="//cdn.jsdelivr.net/npm/[email protected]/slick/slick.min.js"></script>
34+
<script type="text/javascript" src="https://cdn.jsdelivr.net/npm/[email protected]/slick/slick.min.js"></script>
3535
```
3636

3737
#### Package Managers

slick/ajax-loader.gif

-1.58 KB
Loading

slick/slick-theme.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@charset 'UTF-8';
1+
@charset "UTF-8";
22
/* Slider */
33
.slick-loading .slick-list
44
{
@@ -11,9 +11,11 @@
1111
font-family: 'slick';
1212
font-weight: normal;
1313
font-style: normal;
14+
font-display: swap;
1415

1516
src: url('./fonts/slick.eot');
1617
src: url('./fonts/slick.eot?#iefix') format('embedded-opentype'), url('./fonts/slick.woff2') format('woff2'), url('./fonts/slick.woff') format('woff'), url('./fonts/slick.ttf') format('truetype'), url('./fonts/slick.svg#slick') format('svg');
18+
font-display: swap;
1719
}
1820
/* Arrows */
1921
.slick-prev,

slick/slick-theme.less

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
font-style: normal;
7171
src: url('@{slick-font-path}slick.eot');
7272
src: url('@{slick-font-path}slick.eot?#iefix') format('embedded-opentype'), url('@{slick-font-path}slick.woff2') format('woff2'), url('@{slick-font-path}slick.woff') format('woff'), url('@{slick-font-path}slick.ttf') format('truetype'), url('@{slick-font-path}slick.svg#slick') format('svg');
73+
font-display: swap;
7374
}
7475
}
7576
}

slick/slick-theme.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ $slick-opacity-not-active: 0.25 !default;
5555
src: slick-font-url("slick.eot?#iefix") format("embedded-opentype"), slick-font-url("slick.woff2") format("woff2"), slick-font-url("slick.woff") format("woff"), slick-font-url("slick.ttf") format("truetype"), slick-font-url("slick.svg#slick") format("svg");
5656
font-weight: normal;
5757
font-style: normal;
58+
font-display: swap;
5859
}
5960
}
6061

slick/slick.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1325,7 +1325,7 @@
13251325

13261326
Slick.prototype.initADA = function() {
13271327
var _ = this,
1328-
numDotGroups = Math.ceil(_.slideCount / _.options.slidesToShow),
1328+
numDotGroups = Math.ceil(_.slideCount / _.options.slidesToScroll),
13291329
tabControlIndexes = _.getNavigableIndexes().filter(function(val) {
13301330
return (val >= 0) && (val < _.slideCount);
13311331
});

0 commit comments

Comments
 (0)