From 6864149989c6a5b1bb6e9199e1f8af062c64dcc4 Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Wed, 20 Dec 2017 15:14:05 +0000 Subject: [PATCH] Converted to SASS/SCSS --- .eslintrc.json | 4 +- .stylelintrc.json | 21 +- bundles.json | 11 +- changelog.md | 650 +- demo/dist/demo.css | 2 +- demo/dist/demo.js | 2 +- demo/dist/demo.js.map | 2 +- demo/dist/error.css | 1 - demo/src/less/settings/breakpoints.less | 9 - demo/src/less/settings/colors.less | 27 - demo/src/less/settings/plyr.less | 18 - demo/src/less/settings/type.less | 20 - .../demo.less => sass/bundles/demo.scss} | 14 +- .../error.less => sass/bundles/error.scss} | 0 .../components/buttons.scss} | 40 +- .../components/header.scss} | 10 +- .../icons.less => sass/components/icons.scss} | 6 +- .../links.less => sass/components/links.scss} | 23 +- .../lists.less => sass/components/lists.scss} | 0 .../components/navigation.scss} | 2 +- .../components/players.scss} | 20 +- .../core.less => sass/layout/core.scss} | 32 +- .../error.less => sass/layout/error.scss} | 12 +- .../grid.less => sass/layout/grid.scss} | 8 +- .../lib/animation.scss} | 1 - demo/src/sass/lib/decimal.scss | 79 + .../fontface.less => sass/lib/fontface.scss} | 34 +- .../lib/mixins.less => sass/lib/mixins.scss} | 49 +- .../lib/normalize.scss} | 0 .../lib/reset.less => sass/lib/reset.scss} | 0 demo/src/sass/settings/breakpoints.scss | 6 + demo/src/sass/settings/colors.scss | 27 + .../settings/cosmetic.scss} | 6 +- .../icons.less => sass/settings/icons.scss} | 2 +- .../layout.less => sass/settings/layout.scss} | 2 +- demo/src/sass/settings/plyr.scss | 18 + .../settings/spacing.scss} | 2 +- demo/src/sass/settings/type.scss | 20 + .../type/base.less => sass/type/base.scss} | 18 +- .../headings.less => sass/type/headings.scss} | 8 +- .../color.less => sass/utilities/color.scss} | 4 +- .../utilities/hidden.scss} | 0 dist/plyr.css | 1 - dist/plyr.js.map | 2 +- gulpfile.js | 86 +- package-lock.json | 8112 ----------------- package.json | 7 +- src/js/captions.js | 5 +- src/js/controls.js | 33 +- src/js/defaults.js | 43 +- src/js/fullscreen.js | 8 +- src/js/listeners.js | 34 +- src/js/plyr.js | 14 +- src/js/ui.js | 5 +- src/less/settings.less | 112 - src/{less/base.less => sass/base.scss} | 37 +- src/{less/bundle.less => sass/bundle.scss} | 0 .../components/badges.scss} | 8 +- .../components/captions.scss} | 36 +- .../components/control.scss} | 58 +- .../components/controls.scss} | 54 +- .../embed.less => sass/components/embed.scss} | 20 +- .../menus.less => sass/components/menus.scss} | 126 +- .../components/progress.scss} | 46 +- .../components/sliders.scss} | 71 +- .../times.less => sass/components/times.scss} | 8 +- .../components/tooltips.scss} | 44 +- .../video.less => sass/components/video.scss} | 4 +- .../components/volume.scss} | 4 +- .../lib/animation.scss} | 8 +- .../lib/mixins.less => sass/lib/mixins.scss} | 63 +- src/sass/settings.scss | 102 + .../states/fullscreen.scss} | 12 +- .../utils/animation.scss} | 0 .../hidden.less => sass/utils/hidden.scss} | 14 +- src/scss/mixins.scss | 29 - src/scss/plyr.scss | 764 -- src/scss/variables.scss | 73 - yarn.lock | 5731 ++++++++++++ 79 files changed, 7008 insertions(+), 9976 deletions(-) delete mode 100644 demo/dist/error.css delete mode 100644 demo/src/less/settings/breakpoints.less delete mode 100644 demo/src/less/settings/colors.less delete mode 100644 demo/src/less/settings/plyr.less delete mode 100644 demo/src/less/settings/type.less rename demo/src/{less/bundles/demo.less => sass/bundles/demo.scss} (96%) rename demo/src/{less/bundles/error.less => sass/bundles/error.scss} (100%) rename demo/src/{less/components/buttons.less => sass/components/buttons.scss} (73%) rename demo/src/{less/components/header.less => sass/components/header.scss} (56%) rename demo/src/{less/components/icons.less => sass/components/icons.scss} (79%) rename demo/src/{less/components/links.less => sass/components/links.scss} (82%) rename demo/src/{less/components/lists.less => sass/components/lists.scss} (100%) rename demo/src/{less/components/navigation.less => sass/components/navigation.scss} (86%) rename demo/src/{less/components/players.less => sass/components/players.scss} (78%) rename demo/src/{less/layout/core.less => sass/layout/core.scss} (73%) rename demo/src/{less/layout/error.less => sass/layout/error.scss} (80%) rename demo/src/{less/layout/grid.less => sass/layout/grid.scss} (73%) rename demo/src/{less/lib/animation.less => sass/lib/animation.scss} (99%) create mode 100644 demo/src/sass/lib/decimal.scss rename demo/src/{less/lib/fontface.less => sass/lib/fontface.scss} (88%) rename demo/src/{less/lib/mixins.less => sass/lib/mixins.scss} (54%) rename demo/src/{less/lib/normalize.less => sass/lib/normalize.scss} (100%) rename demo/src/{less/lib/reset.less => sass/lib/reset.scss} (100%) create mode 100644 demo/src/sass/settings/breakpoints.scss create mode 100644 demo/src/sass/settings/colors.scss rename demo/src/{less/settings/cosmetic.less => sass/settings/cosmetic.scss} (58%) rename demo/src/{less/settings/icons.less => sass/settings/icons.scss} (90%) rename demo/src/{less/settings/layout.less => sass/settings/layout.scss} (84%) create mode 100644 demo/src/sass/settings/plyr.scss rename demo/src/{less/settings/spacing.less => sass/settings/spacing.scss} (88%) create mode 100644 demo/src/sass/settings/type.scss rename demo/src/{less/type/base.less => sass/type/base.scss} (50%) rename demo/src/{less/type/headings.less => sass/type/headings.scss} (52%) rename demo/src/{less/utilities/color.less => sass/utilities/color.scss} (79%) rename demo/src/{less/utilities/hidden.less => sass/utilities/hidden.scss} (100%) delete mode 100644 dist/plyr.css delete mode 100644 package-lock.json delete mode 100644 src/less/settings.less rename src/{less/base.less => sass/base.scss} (61%) rename src/{less/bundle.less => sass/bundle.scss} (100%) rename src/{less/components/badges.less => sass/components/badges.scss} (69%) rename src/{less/components/captions.less => sass/components/captions.scss} (64%) rename src/{less/components/control.less => sass/components/control.scss} (62%) rename src/{less/components/controls.less => sass/components/controls.scss} (62%) rename src/{less/components/embed.less => sass/components/embed.scss} (72%) rename src/{less/components/menus.less => sass/components/menus.scss} (72%) rename src/{less/components/progress.less => sass/components/progress.scss} (68%) rename src/{less/components/sliders.less => sass/components/sliders.scss} (56%) rename src/{less/components/times.less => sass/components/times.scss} (68%) rename src/{less/components/tooltips.less => sass/components/tooltips.scss} (69%) rename src/{less/components/video.less => sass/components/video.scss} (100%) rename src/{less/components/volume.less => sass/components/volume.scss} (90%) rename src/{less/lib/animation.less => sass/lib/animation.scss} (86%) rename src/{less/lib/mixins.less => sass/lib/mixins.scss} (59%) create mode 100644 src/sass/settings.scss rename src/{less/states/fullscreen.less => sass/states/fullscreen.scss} (68%) rename src/{less/utils/animation.less => sass/utils/animation.scss} (100%) rename src/{less/utils/hidden.less => sass/utils/hidden.scss} (88%) delete mode 100644 src/scss/mixins.scss delete mode 100644 src/scss/plyr.scss delete mode 100644 src/scss/variables.scss create mode 100644 yarn.lock diff --git a/.eslintrc.json b/.eslintrc.json index c0ea7ff9..89426cd5 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -30,7 +30,9 @@ "name": "error", "message": "Use local parameter instead." } - ] + ], + "array-bracket-newline": [2, { "minItems": 2 }], + "array-element-newline": [2, { "minItems": 2 }] }, "parserOptions": { "sourceType": "module" diff --git a/.stylelintrc.json b/.stylelintrc.json index dc24e607..728265e3 100644 --- a/.stylelintrc.json +++ b/.stylelintrc.json @@ -1,7 +1,24 @@ { - "extends": ["stylelint-config-standard", "stylelint-config-prettier"], + "plugins": ["stylelint-selector-bem-pattern", "stylelint-scss"], + "extends": ["stylelint-config-sass-guidelines", "stylelint-config-prettier"], "rules": { + "selector-class-pattern": null, + "selector-no-qualifying-type": [ + true, + { + "ignore": ["attribute", "class"] + } + ], "indentation": 4, - "string-quotes": "single" + "string-quotes": "single", + "max-nesting-depth": 2, + "plugin/selector-bem-pattern": { + "preset": "bem", + "componentName": "(([a-z0-9]+(?!-$)-?)+)", + "componentSelectors": { + "initial": "\\.{componentName}(((__|--)(([a-z0-9\\[\\]'=]+(?!-$)-?)+))+)?$" + }, + "ignoreSelectors": [".*\\.has-.*", ".*\\.is-.*"] + } } } diff --git a/bundles.json b/bundles.json index 726ecbbd..bdfa2c8d 100644 --- a/bundles.json +++ b/bundles.json @@ -1,19 +1,16 @@ { "plyr": { - "less": { - "plyr.css": "src/less/bundle.less" - }, "sass": { - "plyr.css": "src/scss/plyr.scss" + "plyr.css": "src/sass/plyr.scss" }, "js": { "plyr.js": "src/js/plyr.js" } }, "demo": { - "less": { - "demo.css": "demo/src/less/bundles/demo.less", - "error.css": "demo/src/less/bundles/error.less" + "sass": { + "demo.css": "demo/src/sass/bundles/demo.scss", + "error.css": "demo/src/sass/bundles/error.csss" }, "js": { "demo.js": "demo/src/js/demo.js" diff --git a/changelog.md b/changelog.md index 46547433..bef48386 100644 --- a/changelog.md +++ b/changelog.md @@ -1,530 +1,646 @@ # Changelog ## v2.0.12 -- Ability to set custom `blankUrl` for source changes (https://github.com/sampotts/plyr/pull/504) -- Ability to set caption button listener (https://github.com/sampotts/plyr/pull/468) + +* Ability to set custom `blankUrl` for source changes (https://github.com/sampotts/plyr/pull/504) +* Ability to set caption button listener (https://github.com/sampotts/plyr/pull/468) ## v2.0.11 -- Fix for `cleanUp` being called twice (thanks to @sebastiancarlsson) -- Fix for YouTube controls on iPad (fixes #391) + +* Fix for `cleanUp` being called twice (thanks to @sebastiancarlsson) +* Fix for YouTube controls on iPad (fixes #391) ## v2.0.10 -- Added seek event fixes for Vimeo and YouTube (fixes #409) -- Added support for embed URLs rather than ID only (fixes #345) + +* Added seek event fixes for Vimeo and YouTube (fixes #409) +* Added support for embed URLs rather than ID only (fixes #345) ## v2.0.9 -- Temporary patch for the YouTube API issues with `getDuration()` (relates to #374) + +* Temporary patch for the YouTube API issues with `getDuration()` (relates to #374) ## v2.0.8 -- Added `isPaused()` API method (thanks to @darrena092) -- Allowed `.on()` API method to be chainable (thanks to @gurupras) (fixes #357) -- Improved the "awful" rendering of captions on small screens in fullscreen mode (fixes #390) -- Fix for Firefox VTT compatibility (thanks to @magourex) -- Fix for Firefox Developer Edition blank video due to `-webkit-mask-image` issue (fixes #392) -- Added Issue and PR templates with the aim of reducing duplicate or duff issues + +* Added `isPaused()` API method (thanks to @darrena092) +* Allowed `.on()` API method to be chainable (thanks to @gurupras) (fixes #357) +* Improved the "awful" rendering of captions on small screens in fullscreen mode (fixes #390) +* Fix for Firefox VTT compatibility (thanks to @magourex) +* Fix for Firefox Developer Edition blank video due to `-webkit-mask-image` issue (fixes #392) +* Added Issue and PR templates with the aim of reducing duplicate or duff issues ## v2.0.7 -- Fixed `getCurrentTime()` method (fixes #351) -- Added `getVolume()` , `isMuted()` and `getDuration()` API methods (fixes #346) + +* Fixed `getCurrentTime()` method (fixes #351) +* Added `getVolume()` , `isMuted()` and `getDuration()` API methods (fixes #346) ## v2.0.6 -- Fixed merge issue with `Updated define to work with AMD imports #326` PR -- Code formatting + +* Fixed merge issue with `Updated define to work with AMD imports #326` PR +* Code formatting ## v2.0.5 -- Fix for Vimeo in IE9 & IE10 -- Fix for HTML5 elements not firing `ready` event + +* Fix for Vimeo in IE9 & IE10 +* Fix for HTML5 elements not firing `ready` event ## v2.0.4 -- Fix for Firefox full screen (fixes #343) + +* Fix for Firefox full screen (fixes #343) ## v2.0.3 -- Set 'global' keyboard shortcut option to false as default, added `