diff options
author | Sam <me@sampotts.me> | 2016-05-23 22:29:20 +0100 |
---|---|---|
committer | Sam <me@sampotts.me> | 2016-05-23 22:29:20 +0100 |
commit | b3299b464114dc2dd3fd102c4ceb22ce0a1f8349 (patch) | |
tree | cb3bf95727915961d3257d487062e1d2de9b3b33 /src | |
parent | be2e7d4c995c12f691896fccc01eeebfddf1385d (diff) | |
download | plyr-b3299b464114dc2dd3fd102c4ceb22ce0a1f8349.tar.lz plyr-b3299b464114dc2dd3fd102c4ceb22ce0a1f8349.tar.xz plyr-b3299b464114dc2dd3fd102c4ceb22ce0a1f8349.zip |
Fix for Tooltips overflowing (fixes #230)
Diffstat (limited to 'src')
-rw-r--r-- | src/less/plyr.less | 40 | ||||
-rw-r--r-- | src/less/variables.less | 10 | ||||
-rw-r--r-- | src/scss/plyr.scss | 34 | ||||
-rw-r--r-- | src/scss/variables.scss | 8 |
4 files changed, 82 insertions, 10 deletions
diff --git a/src/less/plyr.less b/src/less/plyr.less index 27baa231..3398b603 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -285,7 +285,7 @@ flex-shrink: 0; overflow: visible; // IE11 vertical-align: middle; - padding: (@plyr-control-spacing * .7); + padding: @plyr-control-padding; border: 0; background: transparent; border-radius: 3px; @@ -294,8 +294,8 @@ color: inherit; svg { - width: 18px; - height: 18px; + width: @plyr-control-icon-size; + height: @plyr-control-icon-size; display: block; fill: currentColor; } @@ -485,6 +485,40 @@ z-index: 3; } +// First tooltip +.plyr__controls button:first-child .plyr__tooltip { + left: 0; + transform: translate(0, 10px) scale(.8); + transform-origin: 0 100%; + + &::before { + left: (@plyr-control-icon-size / 2) + @plyr-control-padding; + } +} + +// Last tooltip +.plyr__controls button:last-child .plyr__tooltip { + right: 0; + transform: translate(0, 10px) scale(.8); + transform-origin: 100% 100%; + + &::before { + left: auto; + right: (@plyr-control-icon-size / 2) + @plyr-control-padding; + transform: translateX(50%); + } +} + +.plyr__controls button:first-child, +.plyr__controls button:last-child { + &:hover .plyr__tooltip, + &.tab-focus:focus .plyr__tooltip, + .plyr__tooltip--visible { + transform: translate(0, 0) scale(1); + } +} + + // Playback progress // -------------------------------------------------------------- // <progress> element diff --git a/src/less/variables.less b/src/less/variables.less index 0b2d0895..5798d496 100644 --- a/src/less/variables.less +++ b/src/less/variables.less @@ -16,14 +16,16 @@ @plyr-font-size-base: 16px; // Captions -@plyr-captions-bg: fade(#000, 70%); -@plyr-captions-color: #fff; +@plyr-captions-bg: fade(#000, 70%); +@plyr-captions-color: #fff; @plyr-font-size-captions-base: @plyr-font-size-base; @plyr-font-size-captions-medium: ceil(@plyr-font-size-base * 1.5); @plyr-font-size-captions-large: (@plyr-font-size-base * 2); // Controls +@plyr-control-icon-size: 18px; @plyr-control-spacing: 10px; +@plyr-control-padding: (@plyr-control-spacing * .7); @plyr-video-controls-bg: #000; @plyr-video-control-color: #fff; @plyr-video-control-color-hover: #fff; @@ -37,7 +39,7 @@ // Tooltips @plyr-tooltip-bg: fade(#000, 70%); -@plyr-tooltip-color: #fff; +@plyr-tooltip-color: #fff; @plyr-tooltip-padding: (@plyr-control-spacing / 2); @plyr-tooltip-arrow-size: 4px; @plyr-tooltip-radius: 3px; @@ -62,7 +64,7 @@ @plyr-range-thumb-active-scale: 1.25; @plyr-video-range-track-bg: @plyr-video-progress-buffered-bg; @plyr-audio-range-track-bg: @plyr-audio-progress-buffered-bg; -@plyr-range-selected-bg: @plyr-color-main; +@plyr-range-selected-bg: @plyr-color-main; // Breakpoints @plyr-bp-screen-sm: 480px; diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss index 00fb4320..d886919f 100644 --- a/src/scss/plyr.scss +++ b/src/scss/plyr.scss @@ -484,6 +484,40 @@ z-index: 3; } +// First tooltip +.plyr__controls button:first-child .plyr__tooltip { + $tooltip-arrow-offset: ; + left: 0; + transform: translate(0, 10px) scale(.8); + transform-origin: 0 100%; + + &::before { + left: ($plyr-control-icon-size / 2) + $plyr-control-padding; + } +} + +// Last tooltip +.plyr__controls button:last-child .plyr__tooltip { + right: 0; + transform: translate(0, 10px) scale(.8); + transform-origin: 100% 100%; + + &::before { + left: auto; + right: ($plyr-control-icon-size / 2) + $plyr-control-padding; + transform: translateX(50%); + } +} + +.plyr__controls button:first-child, +.plyr__controls button:last-child { + &:hover .plyr__tooltip, + &.tab-focus:focus .plyr__tooltip, + .plyr__tooltip--visible { + transform: translate(0, 0) scale(1); + } +} + // Playback progress // -------------------------------------------------------------- // <progress> element diff --git a/src/scss/variables.scss b/src/scss/variables.scss index 5aa0d629..5e0a16b3 100644 --- a/src/scss/variables.scss +++ b/src/scss/variables.scss @@ -17,14 +17,16 @@ $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; @@ -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; |