diff options
| author | Sam Potts <me@sampotts.me> | 2018-01-30 09:22:14 +1100 |
|---|---|---|
| committer | Sam Potts <me@sampotts.me> | 2018-01-30 09:22:14 +1100 |
| commit | 71efbe7a927a9638204129ca7a2d52c498fa7e6e (patch) | |
| tree | f0ed45d84bc0304a543bafa08216355e63e55ac8 /demo/src/sass/bundles | |
| parent | afd695cb391535b508dc7a4301b6c2692ce2b607 (diff) | |
| parent | 8f7a8940f36ab85c87a3406a378d383e58ee3d60 (diff) | |
| download | plyr-71efbe7a927a9638204129ca7a2d52c498fa7e6e.tar.lz plyr-71efbe7a927a9638204129ca7a2d52c498fa7e6e.tar.xz plyr-71efbe7a927a9638204129ca7a2d52c498fa7e6e.zip | |
Merge branch 'beta' into fix/ads-blocked
# Conflicts:
# dist/plyr.js
# dist/plyr.js.map
# src/js/plugins/ads.js
# src/js/plyr.js
Diffstat (limited to 'demo/src/sass/bundles')
| -rw-r--r-- | demo/src/sass/bundles/demo.scss | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/demo/src/sass/bundles/demo.scss b/demo/src/sass/bundles/demo.scss index 96438483..2f89b858 100644 --- a/demo/src/sass/bundles/demo.scss +++ b/demo/src/sass/bundles/demo.scss @@ -34,8 +34,13 @@ @import '../components/icons'; @import '../components/links'; @import '../components/lists'; +@import '../components/media'; @import '../components/navigation'; @import '../components/players'; // Plyr @import '../../../../src/sass/plyr'; + +// Utils +@import '../utilities/cosmetic'; +@import '../utilities/hidden'; |