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

Merge branch 'develop' of https://github.com/Selz/plyr into develop

Browse Source
This commit is contained in:
Sam Potts 2017-07-09 17:17:26 +10:00
commit dfc516baf6
9 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
demo/dist/demo.css vendored
View File

File diff suppressed because one or more lines are too long

2
demo/dist/demo.js vendored
View File

File diff suppressed because one or more lines are too long

3
demo/index.html
View File

@ -50,7 +50,7 @@
</li>
</ul>
</nav>
<section>
<video controls crossorigin playsinline poster="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.jpg" id="player">
<!-- Video files -->
<source src="https://cdn.selz.com/plyr/1.5/View_From_A_Blue_Moon_Trailer-HD.mp4" type="video/mp4">
@ -95,7 +95,6 @@
</small>
</li>
</ul>
</section>
</main>
<!-- Plyr core script -->

6
demo/src/less/variables.less
View File

@ -9,7 +9,7 @@
@gray-lighter: #dbe3e8;
@off-white: #f2f5f7;
@brand-primary: #20d193;
@brand-primary: #1aafff;
@brand-secondary: #02BD9B;
// Brands
@ -24,8 +24,8 @@
@font-size-base: 16;
@font-size-small: 14;
@font-size-h1: 64;
@font-weight-base: 500;
@font-weight-bold: 700;
@font-weight-base: 400;
@font-weight-bold: 500;
// Elements
@link-color: @brand-primary;

2
dist/plyr.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/js/plyr.js
View File

@ -3094,7 +3094,7 @@
utils.off(container, utils.transitionEnd, restore)
}
// Listen for the transtion finishing and restore auto height/width
// Listen for the transition finishing and restore auto height/width
utils.on(container, utils.transitionEnd, restore);
// Set dimensions to target
@ -3525,7 +3525,7 @@
}
// Listen for control events
function controlListeners() {
function listeners() {
// IE doesn't support input event, so we fallback to change
var inputEvent = (player.browser.isIE ? 'change' : 'input');
@ -4068,7 +4068,7 @@
injectControls();
// Re-attach listeners
controlListeners();
listeners();
}
// If there's no controls, bail

6
src/less/plyr.less
View File

@ -30,7 +30,7 @@
max-width: 100%;
min-width: 200px;
font-family: @plyr-font-family;
font-weight: 500;
font-weight: @plyr-font-weight-normal;
direction: ltr;
& when (@plyr-border-box = true) {
@ -546,7 +546,7 @@
width: 100%;
padding: @plyr-control-padding (@plyr-control-padding * 2);
color: @plyr-menu-color;
font-weight: 600;
font-weight: @plyr-font-weight-bold;
user-select: none;
&::after {
@ -614,7 +614,7 @@
color: fade(@plyr-menu-color, 80%);
.plyr__badge {
font-weight: 600;
font-weight: @plyr-font-weight-bold;
}
}
}

6
src/less/variables.less
View File

@ -9,12 +9,14 @@
@plyr-sr-only-important: true;
// Colors
@plyr-color-main: #20d193;
@plyr-color-main: #1aafff;
// Font
@plyr-font-family: Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
@plyr-font-family: inherit; //Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
@plyr-font-size-small: 14px;
@plyr-font-size-base: 16px;
@plyr-font-weight-normal: 400;
@plyr-font-weight-bold: 600;
// Captions
@plyr-captions-bg: fade(#000, 60%);