From 3459387f0437913d462377904971bfc65362dfdc Mon Sep 17 00:00:00 2001 From: Sam Potts Date: Wed, 4 Mar 2015 21:28:25 +1100 Subject: Updated icons to make them more obvious --- src/js/plyr.js | 15 ++++++++------- src/less/plyr.less | 30 ++++++++++++------------------ src/sprite/icon-bubble.svg | 6 ------ src/sprite/icon-captions-off.svg | 10 ++++++++++ src/sprite/icon-captions-on.svg | 13 +++++++++++++ src/sprite/icon-collapse.svg | 13 ------------- src/sprite/icon-enter-fullscreen.svg | 13 +++++++++++++ src/sprite/icon-exit-fullscreen.svg | 13 +++++++++++++ src/sprite/icon-expand.svg | 13 ------------- src/sprite/icon-refresh.svg | 7 ------- src/sprite/icon-restart.svg | 10 ++++++++++ src/sprite/icon-sound.svg | 7 ------- src/sprite/icon-volume.svg | 7 +++++++ 13 files changed, 86 insertions(+), 71 deletions(-) delete mode 100755 src/sprite/icon-bubble.svg create mode 100644 src/sprite/icon-captions-off.svg create mode 100644 src/sprite/icon-captions-on.svg delete mode 100644 src/sprite/icon-collapse.svg create mode 100644 src/sprite/icon-enter-fullscreen.svg create mode 100644 src/sprite/icon-exit-fullscreen.svg delete mode 100644 src/sprite/icon-expand.svg delete mode 100755 src/sprite/icon-refresh.svg create mode 100644 src/sprite/icon-restart.svg delete mode 100755 src/sprite/icon-sound.svg create mode 100755 src/sprite/icon-volume.svg (limited to 'src') diff --git a/src/js/plyr.js b/src/js/plyr.js index e8d852e8..f91985ae 100644 --- a/src/js/plyr.js +++ b/src/js/plyr.js @@ -81,7 +81,7 @@ "", "", "", "", "", diff --git a/src/less/plyr.less b/src/less/plyr.less index 232f9b9c..9a53715b 100644 --- a/src/less/plyr.less +++ b/src/less/plyr.less @@ -196,13 +196,13 @@ transition: fill .3s ease; } } - input + label, - input.inverted:checked + label { + [type="checkbox"] + label, + .inverted:checked + label { color: @control-color-inactive; } button, - input.inverted + label, - input:checked + label { + .inverted + label, + [type="checkbox"]:checked + label { color: @control-color; } button { @@ -210,18 +210,19 @@ background: transparent; overflow: hidden; } - input:focus + label, + [type="checkbox"]:focus + label, button:focus { .tab-focus(); color: @control-color-focus; } button:hover, - input + label:hover { + [type="checkbox"] + label:hover { background: @control-bg-hover; color: @control-color-hover; } .icon-exit-fullscreen, - .icon-muted { + .icon-muted, + .icon-captions-on { display: none; } .player-time { @@ -295,15 +296,6 @@ display: inline-block; } - // Muted - &.muted .player-controls .icon-muted { - display: block; - - & + svg { - display: none; - } - } - // Volume control // element // Specificity is for bootstrap compatibility @@ -407,8 +399,10 @@ } } - // When true full screen, show exit fullscreen icon - &.fullscreen-active .icon-exit-fullscreen { + // Change icons on state change + &.fullscreen-active .icon-exit-fullscreen, + &.muted .player-controls .icon-muted, + &.captions-active .player-controls .icon-captions-on { display: block; & + svg { diff --git a/src/sprite/icon-bubble.svg b/src/sprite/icon-bubble.svg deleted file mode 100755 index 0b279b7c..00000000 --- a/src/sprite/icon-bubble.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/sprite/icon-captions-off.svg b/src/sprite/icon-captions-off.svg new file mode 100644 index 00000000..56fc708d --- /dev/null +++ b/src/sprite/icon-captions-off.svg @@ -0,0 +1,10 @@ + + + + icon-captions-off + Created with Sketch. + + + + + \ No newline at end of file diff --git a/src/sprite/icon-captions-on.svg b/src/sprite/icon-captions-on.svg new file mode 100644 index 00000000..4e388e41 --- /dev/null +++ b/src/sprite/icon-captions-on.svg @@ -0,0 +1,13 @@ + + + + icon-captions-on + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/sprite/icon-collapse.svg b/src/sprite/icon-collapse.svg deleted file mode 100644 index d41e0402..00000000 --- a/src/sprite/icon-collapse.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - collapse - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/src/sprite/icon-enter-fullscreen.svg b/src/sprite/icon-enter-fullscreen.svg new file mode 100644 index 00000000..5fd651bd --- /dev/null +++ b/src/sprite/icon-enter-fullscreen.svg @@ -0,0 +1,13 @@ + + + + expand + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/sprite/icon-exit-fullscreen.svg b/src/sprite/icon-exit-fullscreen.svg new file mode 100644 index 00000000..d41e0402 --- /dev/null +++ b/src/sprite/icon-exit-fullscreen.svg @@ -0,0 +1,13 @@ + + + + collapse + Created with Sketch. + + + + + + + + \ No newline at end of file diff --git a/src/sprite/icon-expand.svg b/src/sprite/icon-expand.svg deleted file mode 100644 index 5fd651bd..00000000 --- a/src/sprite/icon-expand.svg +++ /dev/null @@ -1,13 +0,0 @@ - - - - expand - Created with Sketch. - - - - - - - - \ No newline at end of file diff --git a/src/sprite/icon-refresh.svg b/src/sprite/icon-refresh.svg deleted file mode 100755 index 10ffb198..00000000 --- a/src/sprite/icon-refresh.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/sprite/icon-restart.svg b/src/sprite/icon-restart.svg new file mode 100644 index 00000000..3a18dfad --- /dev/null +++ b/src/sprite/icon-restart.svg @@ -0,0 +1,10 @@ + + + + icon-restart + Created with Sketch. + + + + + \ No newline at end of file diff --git a/src/sprite/icon-sound.svg b/src/sprite/icon-sound.svg deleted file mode 100755 index 6c6ca54d..00000000 --- a/src/sprite/icon-sound.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/sprite/icon-volume.svg b/src/sprite/icon-volume.svg new file mode 100755 index 00000000..6c6ca54d --- /dev/null +++ b/src/sprite/icon-volume.svg @@ -0,0 +1,7 @@ + + + + + + + -- cgit v1.2.3