diff options
author | Sam Potts <me@sampotts.me> | 2016-08-20 17:46:05 +1000 |
---|---|---|
committer | Sam Potts <me@sampotts.me> | 2016-08-20 17:46:05 +1000 |
commit | fc45ab48c932c6ecb810ed6456ff824ef43be73c (patch) | |
tree | 557e7520a47f00c89410f124d418722627e0e86e /src/scss/variables.scss | |
parent | 6425a33ccd015a4e21545669c0774e2f12d1c47f (diff) | |
parent | 58e9b02405ccd3c3502bbf221097aa0604796769 (diff) | |
download | plyr-fc45ab48c932c6ecb810ed6456ff824ef43be73c.tar.lz plyr-fc45ab48c932c6ecb810ed6456ff824ef43be73c.tar.xz plyr-fc45ab48c932c6ecb810ed6456ff824ef43be73c.zip |
Merge branch 'master' into develop
# Conflicts:
# src/js/plyr.js
Diffstat (limited to 'src/scss/variables.scss')
-rw-r--r-- | src/scss/variables.scss | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 5aa0d629..7606c8d9 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -13,25 +13,27 @@ $plyr-sr-only-important: true !default; $plyr-color-main: #3498db !default; // Font sizes +$plyr-font-family: 'San Francisco', -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif !default; $plyr-font-size-small: 14px !default; $plyr-font-size-base: 16px !default; // Captions -$plyr-captions-bg: transparentize(#000, .3) !default; -$plyr-captions-color: #fff !default; +$plyr-captions-bg: transparentize(#000, .3) !default; +$plyr-captions-color: #fff !default; $plyr-font-size-captions-base: $plyr-font-size-base !default; $plyr-font-size-captions-medium: ceil($plyr-font-size-base * 1.5) !default; $plyr-font-size-captions-large: ($plyr-font-size-base * 2) !default; // Controls +$plyr-control-icon-size: 18px !default; $plyr-control-spacing: 10px !default; +$plyr-control-padding: ($plyr-control-spacing * .7) !default; $plyr-video-controls-bg: #000 !default; $plyr-video-control-color: #fff !default; $plyr-video-control-color-hover: #fff !default; $plyr-video-control-bg-hover: $plyr-color-main !default; $plyr-audio-controls-bg: #fff !default; $plyr-audio-controls-border: 1px solid #dbe3e8 !default; -$plyr-audio-controls-box-shadow: 0 1px 1px transparentize(#000, .95) !default; $plyr-audio-control-color: #565D64 !default; $plyr-audio-control-color-hover: #fff !default; $plyr-audio-control-bg-hover: $plyr-color-main; @@ -63,7 +65,7 @@ $plyr-range-thumb-active-bg: $plyr-video-control-bg-hover !default; $plyr-range-thumb-active-scale: 1.25 !default; $plyr-video-range-track-bg: $plyr-video-progress-buffered-bg !default; $plyr-audio-range-track-bg: $plyr-audio-progress-buffered-bg !default; -$plyr-range-selected-bg: $plyr-color-main !default; +$plyr-range-selected-bg: $plyr-color-main !default; // Breakpoints $plyr-bp-screen-sm: 480px !default; |