ProximaEntertainment/plyr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual merge of #543 PR

Browse Source
This commit is contained in:
Sam Potts 2017-03-25 10:27:03 +11:00
parent afa1fe9d5f
commit bc323e905c
4 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dist/plyr.css vendored
View File

File diff suppressed because one or more lines are too long

4
dist/plyr.js vendored
View File

File diff suppressed because one or more lines are too long

6
src/less/plyr.less
View File

@ -291,16 +291,14 @@
.plyr__menu { .plyr__menu {
margin-left: (@plyr-control-spacing / 2); margin-left: (@plyr-control-spacing / 2);
&:first-child { &:first-child,
&:first-child + [data-plyr="pause"] {
margin-left: 0; margin-left: 0;
} }
} }
.plyr__volume { .plyr__volume {
margin-left: (@plyr-control-spacing / 2); margin-left: (@plyr-control-spacing / 2);
} }
[data-plyr="pause"] {
margin-left: 0;
}
@media (min-width: @plyr-bp-screen-sm) { @media (min-width: @plyr-bp-screen-sm) {
> .plyr__control, > .plyr__control,

11
src/scss/plyr.scss
View File

@ -269,21 +269,20 @@
text-align: center; text-align: center;
// Spacing // Spacing
> button, > .plyr__control,
.plyr__progress, .plyr__progress,
.plyr__time { .plyr__time,
.plyr__menu {
margin-left: ($plyr-control-spacing / 2); margin-left: ($plyr-control-spacing / 2);
&:first-child { &:first-child,
&:first-child + [data-plyr="pause"] {
margin-left: 0; margin-left: 0;
} }
} }
.plyr__volume { .plyr__volume {
margin-left: ($plyr-control-spacing / 2); margin-left: ($plyr-control-spacing / 2);
} }
[data-plyr="pause"] {
margin-left: 0;
}
// Buttons // Buttons
button { button {