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/captions.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/captions.scss')
| -rw-r--r-- | src/sass/components/captions.scss | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/sass/components/captions.scss b/src/sass/components/captions.scss index d7951b96..85899ef3 100644 --- a/src/sass/components/captions.scss +++ b/src/sass/components/captions.scss @@ -10,7 +10,6 @@ .plyr__captions { animation: plyr-fade-in 0.3s ease; bottom: 0; - color: var(--plyr-captions-text-color); display: none; font-size: $plyr-font-size-captions-small; left: 0; @@ -21,9 +20,12 @@ width: 100%; .plyr__caption { - background: var(--plyr-captions-background); + background: $plyr-captions-background; + background: var(--plyr-captions-background, $plyr-captions-background); border-radius: 2px; box-decoration-break: clone; + color: $plyr-captions-text-color; + color: var(--plyr-captions-text-color, $plyr-captions-text-color); line-height: 185%; padding: 0.2em 0.5em; white-space: pre-wrap; |