ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
# Conflicts:
#	changelog.md
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.js.map
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.js.map
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	package.json
#	readme.md
#	yarn.lock
This commit is contained in:
Sam Potts
2019-01-26 16:50:37 +11:00
parent 464acd1a36 ad72ebd4bb
commit 44739a17d0
20 changed files with 128 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
readme.md
View File

@ -146,13 +146,13 @@ See [initialising](#initialising) for more information on advanced setups.
You can use our CDN (provided by [Fastly](https://www.fastly.com/)) for the JavaScript. There's 2 versions; one with and one without [polyfills](#polyfills). My recommendation would be to manage polyfills seperately as part of your application but to make life easier you can use the polyfilled build.
```html
<script src="https://cdn.plyr.io/3.4.7/plyr.js"></script>
<script src="https://cdn.plyr.io/3.4.8/plyr.js"></script>
```
...or...
```html
<script src="https://cdn.plyr.io/3.4.7/plyr.polyfilled.js"></script>
<script src="https://cdn.plyr.io/3.4.8/plyr.polyfilled.js"></script>
```
### CSS
@ -166,13 +166,17 @@ Include the `plyr.css` stylsheet into your `<head>`
If you want to use our CDN (provided by [Fastly](https://www.fastly.com/)) for the default CSS, you can use the following:
```html
<<<<<<< HEAD
<link rel="stylesheet" href="https://cdn.plyr.io/3.4.7/plyr.css" />
=======
<link rel="stylesheet" href="https://cdn.plyr.io/3.4.8/plyr.css">
>>>>>>> master
```
### SVG Sprite
The SVG sprite is loaded automatically from our CDN (provided by [Fastly](https://www.fastly.com/)). To change this, see the [options](#options) below. For
reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.4.7/plyr.svg`.
reference, the CDN hosted SVG sprite can be found at `https://cdn.plyr.io/3.4.8/plyr.svg`.
## Ads