Commit Graph

74 Commits

Author SHA1 Message Date
776fd099f3 fix invalid CSS @charset rule (#2466) 2022-04-19 22:00:20 +10:00
1d4869beee feat: tweaks to markers logic and design 2022-04-18 20:15:30 +10:00
4632614ced feat: add markers (#2386)
Co-authored-by: fengshuo <fengshuo@bilibili.com>
2022-02-12 20:35:52 +11:00
675a853e2e chore: SASS clean up 2021-12-16 22:59:25 +11:00
502d5977d7 Converted to 2 space indentation 2020-04-11 16:23:14 +10:00
da943b384c Merge branch 'develop' into css-variables
# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.min.js.map
#	demo/index.html
#	dist/plyr.css
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs.map
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs.map
#	gulpfile.js
#	src/sass/base.scss
#	src/sass/components/control.scss
#	src/sass/settings/colors.scss
#	src/sass/settings/controls.scss
2020-03-30 10:45:57 +11:00
5837c2d5f0 SASS orginasation clean up and flex-direction added 2020-02-10 11:23:57 +00:00
f8a28b632c Audio style fix 2020-01-26 22:05:21 +00:00
8fc6c2ba52 File rename and clean up 2019-06-21 00:19:37 +10:00
12c6282d14 Merge branch 'develop' into css-variables
# Conflicts:
#	.eslintrc
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	dist/plyr.min.js
#	dist/plyr.min.js.map
#	dist/plyr.min.mjs
#	dist/plyr.min.mjs.map
#	dist/plyr.mjs
#	dist/plyr.polyfilled.js
#	dist/plyr.polyfilled.min.js
#	dist/plyr.polyfilled.min.js.map
#	dist/plyr.polyfilled.min.mjs
#	dist/plyr.polyfilled.min.mjs.map
#	dist/plyr.polyfilled.mjs
#	gulpfile.js
#	package.json
2019-06-01 19:55:14 +10:00
c885d59270 Moved all video styles together 2019-04-12 12:43:45 +10:00
35f7ee9c59 Merge branch 'develop' into css-variables
# Conflicts:
#	demo/dist/demo.css
#	demo/index.html
#	dist/plyr.css
#	gulpfile.js
#	package.json
#	yarn.lock
2019-03-16 12:14:20 +11:00
8f27611911 Preview seek/scrubbing thumbnails 2018-11-12 15:55:26 +11:00
b7b2e3c0aa Merge branch 'develop' into css-variables
# Conflicts:
#	demo/dist/demo.css
#	demo/dist/demo.js
#	demo/dist/demo.js.map
#	demo/dist/demo.min.js
#	demo/dist/demo.min.js.map
#	dist/plyr.css
#	dist/plyr.js
#	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
#	gulpfile.js
#	src/sass/components/captions.scss
#	src/sass/components/control.scss
2018-11-11 11:05:09 +11:00
108bd3dfa0 Fixed incorrect BEM formatting, fixed buffer alignment 2018-05-31 23:33:59 +10:00
3e0a911418 WIP 2018-05-26 13:37:10 +10:00
d7356726a1 Remove ui.checkFailed() and error class 2018-05-16 23:21:06 +02:00
9ebc2719d3 v3.3.0 2018-05-06 00:49:12 +10:00
73a39769d4 Fullscreen API changes, color settings tweaks 2018-02-11 15:09:34 +11:00
22e8892993 Code tweaks 2018-01-14 23:15:33 +11:00
025fc1090b Implementing ads plugin 2018-01-13 23:02:59 +01:00
Sam
92cb9e22e2 Started on error handling 2018-01-04 13:43:56 +11:00
98ac98b4c2 Vimeo fix 2017-12-21 00:20:56 +00:00
742018a716 Fix SASS bundle 2017-12-20 21:08:44 +00:00
Sam
4f02e2d6e7 Docs updates, small tweaks 2016-04-28 22:07:35 +10:00
67b2f2510b Bug fix for embeds: play not being defined (fixes #185 and #186) 2016-03-27 18:29:58 +11:00
c41e5320c8 SASS fixes, Default font stack added 2016-03-13 21:22:51 +11:00
cad142fe85 Merge branch 'master' of github.com:selz/plyr
# Conflicts:
#	src/js/plyr.js
2016-02-21 14:04:13 +11:00
b18ed03384 WIP on captions bug, manual duration option, reset media object 2016-02-21 13:17:30 +11:00
ce51344269 iOS fix (Fixes #166), Edge Progress Tip (Fixes #160), SASS fix (Fixes #158) 2016-02-13 22:18:42 +11:00
a327056789 Seek fixes for touch 2016-01-25 11:25:32 +11:00
3127cea1b2 SASS fix (fixes #149) 2016-01-25 08:36:53 +11:00
a965d8a893 Seek tooltip, bug fixes for SASS, fullscreen and icons 2016-01-24 11:25:31 +11:00
02d312f2d2 Style tweaks 2016-01-18 18:27:01 +11:00
2e5bdb338e Tidying up, Vimeo fix 2016-01-18 17:35:18 +11:00
Sam
dbe152a4c1 LESS/SASS variable name spacing and clean up 2016-01-17 19:22:43 +11:00
bc7a6ebdde Keyboard nav fixes (seek & focus trap in fullscreen), SASS updates 2016-01-14 21:20:46 +11:00
125a95e9e1 Audio fullscreen, Tooltip tweaks, Docs 2015-10-25 11:57:52 +11:00
58f8cdd8c8 Sass updated 2015-10-05 16:38:02 +11:00
daec1baebc Source API changes, Vimeo fixes, still WIP 2015-10-04 19:27:30 +11:00
66f724a3be Update plyr.scss - Fix new scss!
This is a fix the newly added scss.
2015-08-10 10:03:21 -03:00
38a206892b YouTube, Captions and Control improvements
- Controls improvements (Fixes #103)
- YouTube bug fixes (Fixes #105)
- Internationalization support (Fixes #101)
- Captions legibility improvements
2015-08-08 14:37:12 +10:00
75c090e8b9 Update plyr.scss - Make it work V3! 2015-08-06 14:21:36 -03:00
9534db823d Update plyr.scss - Make it work V2!
Hi, thanks for accepting my previous pull request. I made this request because the variables control-color and control-color-hover weren't being set inside the mixin so i took them out and it's working now again. I hope you can merge this as it isnt completly working yet and sorry for the delay. Thanks again! :)
2015-07-31 10:59:03 -03:00
1ba1bec066 Merge branch 'master' of github.com:selz/plyr
# Conflicts:
#	src/sass/plyr.scss
2015-07-31 21:34:07 +10:00
aad4a720dc Tooltip fix for NVDA 2015-07-31 21:32:12 +10:00
00cf797c20 Restored !default and fullscreen logic in SASS 2015-07-28 11:29:49 +10:00
04cf5dfda1 Update plyr.scss - Make it work
There were some things that needed to be changed for the sass preprocessor to work. There were some variables declared as @ that need to be declared with the right syntax: $. Also sass evaluation is eager, while less evaluation is _lazy_ that means in sass, mixins should be declared before they are use. I hope you can accept this change as it's currently not working. Thanks!
2015-07-27 13:04:02 -03:00
5d19b43888 Tooltip tweak 2015-07-25 21:35:12 +10:00
a0d2d5cd24 Minor tweaks 2015-07-25 20:29:19 +10:00