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/settings/controls.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/settings/controls.scss')
-rw-r--r-- | src/sass/settings/controls.scss | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/sass/settings/controls.scss b/src/sass/settings/controls.scss index 77387567..ee88434a 100644 --- a/src/sass/settings/controls.scss +++ b/src/sass/settings/controls.scss @@ -3,7 +3,6 @@ // ========================================================================== $plyr-control-icon-size: 18px !default; -$plyr-control-icon-size-large: 20px !default; $plyr-control-spacing: 10px !default; $plyr-control-padding: ($plyr-control-spacing * 0.7) !default; $plyr-control-radius: 3px !default; |