Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into chromecast-develop
Browse files Browse the repository at this point in the history
  • Loading branch information
gurupras committed Feb 5, 2019
2 parents 73c1c9b + ad72ebd commit bf803a2
Show file tree
Hide file tree
Showing 60 changed files with 4,179 additions and 2,105 deletions.
376 changes: 197 additions & 179 deletions changelog.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions controls.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ controls: [
'settings', // Settings menu
'pip', // Picture-in-picture (currently Safari only)
'airplay', // Airplay (currently Safari only)
'download', // Show a download button with a link to either the current source or a custom URL you specify in your options
'fullscreen', // Toggle fullscreen
];
```
Expand Down
2 changes: 1 addition & 1 deletion demo/dist/demo.css

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions demo/dist/demo.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demo/dist/demo.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/dist/demo.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo/dist/demo.min.js.map

Large diffs are not rendered by default.

453 changes: 281 additions & 172 deletions demo/index.html

Large diffs are not rendered by default.

23 changes: 0 additions & 23 deletions demo/src/js/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,27 +276,4 @@ import Raven from 'raven-js';
if (env.prod) {
Raven.config('https://[email protected]/305555').install();
}

// Google analytics
// For demo site (https://plyr.io) only
/* eslint-disable */
if (env.prod) {
((i, s, o, g, r, a, m) => {
i.GoogleAnalyticsObject = r;
i[r] =
i[r] ||
function() {
(i[r].q = i[r].q || []).push(arguments);
};
i[r].l = 1 * new Date();
a = s.createElement(o);
m = s.getElementsByTagName(o)[0];
a.async = 1;
a.src = g;
m.parentNode.insertBefore(a, m);
})(window, document, 'script', 'https://www.google-analytics.com/analytics.js', 'ga');
window.ga('create', 'UA-40881672-11', 'auto');
window.ga('send', 'pageview');
}
/* eslint-enable */
})();
9 changes: 6 additions & 3 deletions demo/src/sass/lib/fontface.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
font-family: 'Gordita';
font-style: normal;
font-weight: $font-weight-light;
src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-light.woff') format('woff');
src: url('https://cdn.plyr.io/static/fonts/gordita-light.woff2') format('woff2'),
url('https://cdn.plyr.io/static/fonts/gordita-light.woff') format('woff');
}

@font-face {
Expand All @@ -33,13 +34,15 @@
font-family: 'Gordita';
font-style: normal;
font-weight: $font-weight-bold;
src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-bold.woff') format('woff');
src: url('https://cdn.plyr.io/static/fonts/gordita-bold.woff2') format('woff2'),
url('https://cdn.plyr.io/static/fonts/gordita-bold.woff') format('woff');
}

@font-face {
font-display: swap;
font-family: 'Gordita';
font-style: normal;
font-weight: $font-weight-black;
src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'), url('https://cdn.plyr.io/static/fonts/gordita-black.woff') format('woff');
src: url('https://cdn.plyr.io/static/fonts/gordita-black.woff2') format('woff2'),
url('https://cdn.plyr.io/static/fonts/gordita-black.woff') format('woff');
}
3 changes: 3 additions & 0 deletions demo/src/sass/settings/plyr.scss
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ $plyr-font-size-small: 12px;
$plyr-font-size-time: 11px;
$plyr-font-size-badges: 9px;

// Other
$plyr-font-smoothing: true;

// Captions
$plyr-font-size-captions-base: $plyr-font-size-base;
$plyr-font-size-captions-small: $plyr-font-size-small;
Expand Down
2 changes: 1 addition & 1 deletion dist/plyr.css

Large diffs are not rendered by default.

Loading

0 comments on commit bf803a2

Please sign in to comment.