aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Potts <sam@potts.es>2017-11-19 23:35:23 +1100
committerSam Potts <sam@potts.es>2017-11-19 23:35:23 +1100
commit000afdd3008af955feed85be01ffa5fbedc5c86e (patch)
tree3d4e6722061a4cf62e9f6fd731559ad1503976fe /src
parent0dc9681ae8d940fe3ff174234a7e66b42aab2c3e (diff)
parentdc391c98c6c77479b994dbe7ee00093e1684eea4 (diff)
downloadplyr-000afdd3008af955feed85be01ffa5fbedc5c86e.tar.lz
plyr-000afdd3008af955feed85be01ffa5fbedc5c86e.tar.xz
plyr-000afdd3008af955feed85be01ffa5fbedc5c86e.zip
Merge branch 'develop' of github.com:Selz/plyr into develop
Diffstat (limited to 'src')
-rw-r--r--src/less/components/captions.less4
-rw-r--r--src/less/components/menus.less1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/less/components/captions.less b/src/less/components/captions.less
index 084bbf03..3082b899 100644
--- a/src/less/components/captions.less
+++ b/src/less/components/captions.less
@@ -26,8 +26,8 @@
padding: 0.2em 0.5em;
background: @plyr-captions-bg;
box-decoration-break: clone;
- line-height: 170%;
- white-space: pre-wrap;
+ line-height: 185%;
+ white-space: pre;
// Firefox adds a <div> when using getCueAsHTML()
div {
diff --git a/src/less/components/menus.less b/src/less/components/menus.less
index 8c2d400d..2b3ae418 100644
--- a/src/less/components/menus.less
+++ b/src/less/components/menus.less
@@ -177,6 +177,7 @@
display: flex;
align-items: center;
margin-left: auto;
+ margin-right: -@plyr-control-padding;
padding-left: ceil(@plyr-control-padding * 3.5);
pointer-events: none;
overflow: hidden;