diff options
| author | Sam <me@sampotts.me> | 2015-12-13 22:49:02 +1100 |
|---|---|---|
| committer | Sam <me@sampotts.me> | 2015-12-13 22:49:02 +1100 |
| commit | ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66 (patch) | |
| tree | 4feca9ae1fabe2d449184c44de109aa87876143b /readme.md | |
| parent | cd2532867c2976bcc61dc3fa2084a9e77bf59abf (diff) | |
| parent | 1371c1341fcc95d52394dc3f69900ae5041a5701 (diff) | |
| download | plyr-ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66.tar.lz plyr-ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66.tar.xz plyr-ee2cdb2c9b2dd10b0e638ff45247c55276e1bc66.zip | |
Merge branch 'master' into develop
# Conflicts:
# dist/plyr.css
# dist/plyr.js
# docs/dist/docs.css
# docs/dist/docs.js
# docs/index.html
# docs/src/js/docs.js
# docs/src/less/components/icons.less
# docs/src/less/components/type.less
# docs/src/less/docs.less
# gulpfile.js
# package.json
# src/js/plyr.js
Diffstat (limited to 'readme.md')
| -rw-r--r-- | readme.md | 18 |
1 files changed, 9 insertions, 9 deletions
@@ -1,7 +1,7 @@ # Plyr A simple, accessible HTML5 media player. -[Checkout the demo](http://plyr.io) +Checkout the [demo](http://plyr.io). [](http://plyr.io) @@ -24,9 +24,9 @@ We wanted a lightweight, accessible and customisable media player that just supp Oh and yes, it works with Bootstrap. ## Changelog -Check out [the changelog](changelog.md) +Check out the [changelog](changelog.md). -## Planned development +## Planned Development - Vimeo support - Playback speed - Playlists @@ -34,13 +34,13 @@ Check out [the changelog](changelog.md) - Audio captions ... and whatever else has been raised in [issues](https://github.com/Selz/plyr/issues) -If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or of course, forking and sending a pull request. +If you have any cool ideas or features, please let me know by [creating an issue](https://github.com/Selz/plyr/issues/new) or, of course, forking and sending a pull request. ## Implementation Check `docs/index.html` and `docs/dist/docs.js` for an example setup. -**Heads up**, the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.3.5/plyr.js` to `https://cdn.plyr.io/1.3.5/plyr.js` +**Heads up:** the example `index.html` file needs to be served from a webserver (such as Apache, Nginx, IIS or similar) unless you change the file sources to include http or https. e.g. change `//cdn.plyr.io/1.3.7/plyr.js` to `https://cdn.plyr.io/1.3.7/plyr.js` ### Bower If bower is your thang, you can grab Plyr using: @@ -60,14 +60,14 @@ More info is on [npm](https://www.npmjs.com/package/ember-cli-plyr) and [GitHub] If you want to use our CDN, you can use the following: ```html -<link rel="stylesheet" href="https://cdn.plyr.io/1.3.5/plyr.css"> -<script src="https://cdn.plyr.io/1.3.5/plyr.js"></script> +<link rel="stylesheet" href="https://cdn.plyr.io/1.3.7/plyr.css"> +<script src="https://cdn.plyr.io/1.3.7/plyr.js"></script> ``` -You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.3.5/sprite.svg`. +You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.3.7/sprite.svg`. ### CSS -If you want to use the default css, add the `plyr.css` file from /dist into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. +If you want to use the default css, add the `plyr.css` file from `/dist` into your head, or even better use `plyr.less` or `plyr.sass` file included in `/src` in your build to save a request. ```html <link rel="stylesheet" href="dist/plyr.css"> |