aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSam Potts <me@sampotts.me>2016-06-26 08:34:36 +1000
committerSam Potts <me@sampotts.me>2016-06-26 08:34:36 +1000
commit7e7508ca821b930fc132370d6d490e9c16d983a4 (patch)
treeeb2345e6edf8cc1057064890eeda84b03315d7e5 /src
parent095d100ba44e828f82fb432c5d47fb89a6eaaaf4 (diff)
downloadplyr-7e7508ca821b930fc132370d6d490e9c16d983a4.tar.lz
plyr-7e7508ca821b930fc132370d6d490e9c16d983a4.tar.xz
plyr-7e7508ca821b930fc132370d6d490e9c16d983a4.zip
Fixed overflow issues (fixes #286)
Diffstat (limited to 'src')
-rw-r--r--src/js/plyr.js6
-rw-r--r--src/less/plyr.less3
-rw-r--r--src/less/variables.less7
-rw-r--r--src/scss/plyr.scss3
-rw-r--r--src/scss/variables.scss1
5 files changed, 10 insertions, 10 deletions
diff --git a/src/js/plyr.js b/src/js/plyr.js
index b7f89258..fa66dca8 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -1,6 +1,6 @@
// ==========================================================================
// Plyr
-// plyr.js v1.8.4
+// plyr.js v1.8.5
// https://github.com/selz/plyr
// License: The MIT License (MIT)
// ==========================================================================
@@ -44,7 +44,7 @@
displayDuration: true,
loadSprite: true,
iconPrefix: 'plyr',
- iconUrl: 'https://cdn.plyr.io/1.8.4/plyr.svg',
+ iconUrl: 'https://cdn.plyr.io/1.8.5/plyr.svg',
clickToPlay: true,
hideControls: true,
showPosterOnEnd: false,
@@ -191,7 +191,7 @@
if ((navigator.appVersion.indexOf('Windows NT') !== -1) && (navigator.appVersion.indexOf('rv:11') !== -1)) {
isIE = true;
name = 'IE';
- fullVersion = '11;';
+ fullVersion = '11';
}
// MSIE
else if ((verOffset = ua.indexOf('MSIE')) !== -1) {
diff --git a/src/less/plyr.less b/src/less/plyr.less
index c6d15363..23323b98 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -19,8 +19,7 @@
position: relative;
max-width: 100%;
min-width: 200px;
- overflow: hidden;
- font-family: Avenir, "Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif;
+ font-family: @plyr-font-family;
direction: ltr;
& when (@plyr-border-box = true) {
diff --git a/src/less/variables.less b/src/less/variables.less
index 5798d496..21d369ba 100644
--- a/src/less/variables.less
+++ b/src/less/variables.less
@@ -11,9 +11,10 @@
// Colors
@plyr-color-main: #3498db;
-// Font sizes
-@plyr-font-size-small: 14px;
-@plyr-font-size-base: 16px;
+// Font
+@plyr-font-family: 'San Francisco', -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
+@plyr-font-size-small: 13px;
+@plyr-font-size-base: 15px;
// Captions
@plyr-captions-bg: fade(#000, 70%);
diff --git a/src/scss/plyr.scss b/src/scss/plyr.scss
index 0974ebee..afc679f2 100644
--- a/src/scss/plyr.scss
+++ b/src/scss/plyr.scss
@@ -19,8 +19,7 @@
position: relative;
max-width: 100%;
min-width: 200px;
- overflow: hidden;
- font-family: Avenir, "Avenir Next", "Helvetica Neue", "Segoe UI", Helvetica, Arial, sans-serif;
+ font-family: $plyr-font-family;
direction: ltr;
@if $plyr-border-box == true {
diff --git a/src/scss/variables.scss b/src/scss/variables.scss
index 5e0a16b3..9eafbe44 100644
--- a/src/scss/variables.scss
+++ b/src/scss/variables.scss
@@ -13,6 +13,7 @@ $plyr-sr-only-important: true !default;
$plyr-color-main: #3498db !default;
// Font sizes
+$plyr-font-family: 'San Francisco', -apple-system, BlinkMacSystemFont, '.SFNSText-Regular', Avenir, 'Avenir Next', 'Helvetica Neue', 'Segoe UI', Helvetica, Arial, sans-serif;
$plyr-font-size-small: 14px !default;
$plyr-font-size-base: 16px !default;