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/menus.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/menus.scss')
| -rw-r--r-- | src/sass/components/menus.scss | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/sass/components/menus.scss b/src/sass/components/menus.scss index b8c85284..50a47248 100644 --- a/src/sass/components/menus.scss +++ b/src/sass/components/menus.scss @@ -24,7 +24,7 @@ // The actual menu container &__container { animation: plyr-popup 0.2s ease; - background: $plyr-menu-bg; + background: $plyr-menu-background; border-radius: 4px; bottom: 100%; box-shadow: $plyr-menu-shadow; @@ -39,14 +39,13 @@ > div { overflow: hidden; - transition: height 0.35s cubic-bezier(0.4, 0, 0.2, 1), - width 0.35s cubic-bezier(0.4, 0, 0.2, 1); + transition: height 0.35s cubic-bezier(0.4, 0, 0.2, 1), width 0.35s cubic-bezier(0.4, 0, 0.2, 1); } // Arrow &::after { border: 4px solid transparent; - border-top-color: $plyr-menu-bg; + border-top-color: $plyr-menu-background; content: ''; height: 0; position: absolute; @@ -74,8 +73,7 @@ color: $plyr-menu-color; display: flex; font-size: $plyr-font-size-menu; - padding: ceil($plyr-control-padding / 2) - ceil($plyr-control-padding * 1.5); + padding: ceil($plyr-control-padding / 2) ceil($plyr-control-padding * 1.5); user-select: none; width: 100%; @@ -174,7 +172,7 @@ &[aria-checked='true'] { &::before { - background: $plyr-color-main; + background: var(--plyr-color-main, $plyr-color-main); } &::after { opacity: 1; |