aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSam Potts <sam@selz.com>2015-07-28 11:31:32 +1000
committerSam Potts <sam@selz.com>2015-07-28 11:31:32 +1000
commita9783481235d349d696025fff9edbf4622d8e467 (patch)
treebab54e848c5de48cea05a3522aaa59a0d6db105f
parent00cf797c200857b4726c8562c416769ccfaf2bb9 (diff)
downloadplyr-a9783481235d349d696025fff9edbf4622d8e467.tar.lz
plyr-a9783481235d349d696025fff9edbf4622d8e467.tar.xz
plyr-a9783481235d349d696025fff9edbf4622d8e467.zip
Version bump
-rw-r--r--changelog.md3
-rw-r--r--docs/error.html2
-rw-r--r--docs/index.html10
-rw-r--r--package.json2
-rw-r--r--readme.md8
-rw-r--r--src/js/plyr.js2
6 files changed, 15 insertions, 12 deletions
diff --git a/changelog.md b/changelog.md
index 14838160..e1bbcdee 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,8 @@
# Changelog
+## v1.2.6
+- SASS updates and fixes (cheers @ChristianPV)
+
## v1.2.5
- Fix for YouTube quality (let them decide quality)
diff --git a/docs/error.html b/docs/error.html
index 592045dc..81297a15 100644
--- a/docs/error.html
+++ b/docs/error.html
@@ -6,7 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Docs styles -->
- <link rel="stylesheet" href="//cdn.plyr.io/1.2.5/docs.css">
+ <link rel="stylesheet" href="//cdn.plyr.io/1.2.6/docs.css">
</head>
<body>
<main>
diff --git a/docs/index.html b/docs/index.html
index 5205c4f6..f22503d5 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -8,10 +8,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<!-- Styles -->
- <link rel="stylesheet" href="https://cdn.plyr.io/1.2.5/plyr.css?2">
+ <link rel="stylesheet" href="https://cdn.plyr.io/1.2.6/plyr.css?2">
<!-- Docs styles -->
- <link rel="stylesheet" href="https://cdn.plyr.io/1.2.5/docs.css?1">
+ <link rel="stylesheet" href="https://cdn.plyr.io/1.2.6/docs.css?1">
</head>
<body>
<header>
@@ -97,13 +97,13 @@
b.insertBefore(c, b.childNodes[0]);
}
}
- })(document, "https://cdn.plyr.io/1.2.5/sprite.svg");
+ })(document, "https://cdn.plyr.io/1.2.6/sprite.svg");
</script>
<!-- Plyr core script -->
- <script src="https://cdn.plyr.io/1.2.5/plyr.js?1"></script>
+ <script src="https://cdn.plyr.io/1.2.6/plyr.js?1"></script>
<!-- Docs script -->
- <script src="https://cdn.plyr.io/1.2.5/docs.js?1"></script>
+ <script src="https://cdn.plyr.io/1.2.6/docs.js?1"></script>
</body>
</html>
diff --git a/package.json b/package.json
index 5d91133f..b0eccf5f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "plyr",
- "version": "1.2.5",
+ "version": "1.2.6",
"description": "A simple HTML5 media player using custom controls",
"homepage": "http://plyr.io",
"main": "gulpfile.js",
diff --git a/readme.md b/readme.md
index 2df7e465..23f5a826 100644
--- a/readme.md
+++ b/readme.md
@@ -39,7 +39,7 @@ If you have any cool ideas or features, please let me know by [creating an issue
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.2.5/plyr.js` to `https://cdn.plyr.io/1.2.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.2.6/plyr.js` to `https://cdn.plyr.io/1.2.6/plyr.js`
### Bower
If bower is your thang, you can grab Plyr using:
@@ -59,11 +59,11 @@ 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.2.5/plyr.css">
-<script src="https://cdn.plyr.io/1.2.5/plyr.js"></script>
+<link rel="stylesheet" href="https://cdn.plyr.io/1.2.6/plyr.css">
+<script src="https://cdn.plyr.io/1.2.6/plyr.js"></script>
```
-You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.5/sprite.svg`.
+You can also access the `sprite.svg` file at `https://cdn.plyr.io/1.2.6/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.
diff --git a/src/js/plyr.js b/src/js/plyr.js
index 90042b09..593a64b4 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v1.2.5
+// plyr.js v1.2.6
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================