diff options
| author | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
|---|---|---|
| committer | Sam Potts <sam@potts.es> | 2020-03-30 10:45:57 +1100 |
| commit | da943b384ca334cad66fd261cb9a0f924716da9d (patch) | |
| tree | 5aaac37b474a2708c7910eb536b9d96d4c0dcff3 /src/sass/components/badges.scss | |
| parent | 50a7c2fad6f0d9b03788fe57a855894eafcf5ef7 (diff) | |
| parent | ad63af5096e014785bd22eac24bc8030c0dc70d6 (diff) | |
| download | plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.lz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.tar.xz plyr-da943b384ca334cad66fd261cb9a0f924716da9d.zip | |
Merge branch 'develop' into css-variables
# Conflicts:
# demo/dist/demo.css
# demo/dist/demo.min.js.map
# demo/index.html
# dist/plyr.css
# dist/plyr.min.js.map
# dist/plyr.min.mjs.map
# dist/plyr.polyfilled.min.js.map
# dist/plyr.polyfilled.min.mjs.map
# gulpfile.js
# src/sass/base.scss
# src/sass/components/control.scss
# src/sass/settings/colors.scss
# src/sass/settings/controls.scss
Diffstat (limited to 'src/sass/components/badges.scss')
| -rw-r--r-- | src/sass/components/badges.scss | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sass/components/badges.scss b/src/sass/components/badges.scss index 46c87d03..b0d575bb 100644 --- a/src/sass/components/badges.scss +++ b/src/sass/components/badges.scss @@ -3,10 +3,10 @@ // -------------------------------------------------------------- .plyr__badge { - background: $plyr-badge-bg; + background: var(--plyr-badge-background, $plyr-badge-background); border-radius: 2px; - color: $plyr-badge-color; - font-size: var(--plyr-font-size-badge); + color: var(--plyr-badge-color, $plyr-badge-color); + font-size: var(--plyr-font-size-badge, $plyr-font-size-badge); line-height: 1; padding: 3px 4px; } |