diff options
| author | Sam Potts <sam@potts.es> | 2018-11-11 11:05:09 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2018-11-11 11:05:09 +1100 |
| commit | b7b2e3c0aa0749eed53ae91230082cb0482e1f28 (patch) | |
| tree | f073bde14df6459419323dd6570b2549b8d26c41 /src/sass/plyr.scss | |
| parent | 3e0a91141822758094b2cbd5f0ecdd8ce4142b5f (diff) | |
| parent | 2c8a337f265f3f84133bc674f3836802588c0c13 (diff) | |
| download | plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.tar.lz plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.tar.xz plyr-b7b2e3c0aa0749eed53ae91230082cb0482e1f28.zip | |
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
Diffstat (limited to 'src/sass/plyr.scss')
| -rw-r--r-- | src/sass/plyr.scss | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss index 6a283dc1..7c36c307 100644 --- a/src/sass/plyr.scss +++ b/src/sass/plyr.scss @@ -34,12 +34,12 @@ $css-vars-use-native: true; @import 'components/controls'; @import 'components/embed'; @import 'components/menus'; -@import 'components/progress'; -@import 'components/poster'; @import 'components/sliders'; +@import 'components/poster'; @import 'components/times'; @import 'components/tooltips'; @import 'components/video'; +@import 'components/progress'; @import 'components/volume'; @import 'states/fullscreen'; |