Merge branch 'master' into develop

# Conflicts:
#	src/less/plyr.less
This commit is contained in:
Sam Potts 2016-05-09 19:11:57 +10:00
commit 3470d5f5e6

View File

@ -76,9 +76,6 @@
&::-moz-range-thumb { &::-moz-range-thumb {
@include plyr-range-thumb(); @include plyr-range-thumb();
} }
&::-moz-focus-outer {
border: 0;
}
// Microsoft // Microsoft
&::-ms-track { &::-ms-track {
@ -445,17 +442,16 @@
transform-origin: 50% 100%; transform-origin: 50% 100%;
transition: transform .2s .1s ease, opacity .2s .1s ease; transition: transform .2s .1s ease, opacity .2s .1s ease;
// Arrows
&::before { &::before {
// Arrows
content: ''; content: '';
position: absolute; position: absolute;
width: 0; width: 0;
height: 0; height: 0;
left: 50%; left: 50%;
transform: translateX(-50%); transform: translateX(-50%);
}
// The background triangle // The background triangle
&::before {
bottom: -$plyr-tooltip-arrow-size; bottom: -$plyr-tooltip-arrow-size;
border-right: $plyr-tooltip-arrow-size solid transparent; border-right: $plyr-tooltip-arrow-size solid transparent;
border-top: $plyr-tooltip-arrow-size solid $plyr-tooltip-bg; border-top: $plyr-tooltip-arrow-size solid $plyr-tooltip-bg;