Merge branch 'master' of github.com:captbaritone/winamp2-js

This commit is contained in:
Jordan Eldredge 2015-04-23 13:58:54 -07:00
commit 8743bd167b
2 changed files with 16 additions and 20 deletions

View file

@ -3,7 +3,7 @@
position: absolute;
height: 116px;
width: 275px;
cursor:url('../cursors/MAINMENU.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/MAINMENU.PNG'), auto;
/* Ask the browser to scale showing large pixels if possible */
image-rendering: -moz-crisp-edges; /* Firefox */
image-rendering: -o-crisp-edges; /* Opera */
@ -59,7 +59,7 @@
left: 0;
height: 14px;
width: 275px;
cursor:url('../cursors/TITLEBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/TITLEBAR.PNG'), auto;
}
#winamp2-js #option,
@ -70,7 +70,7 @@
height: 9px;
width: 9px;
top: 3px;
cursor:url('../cursors/MAINMENU.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/MAINMENU.PNG'), auto;
}
#winamp2-js #title-bar #option {
@ -94,7 +94,7 @@
}
#winamp2-js #title-bar #close {
left: 264px;
cursor:url('../cursors/CLOSE.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/CLOSE.PNG'), auto;
}
#winamp2-js #clutter-bar {
position: absolute;
@ -279,20 +279,20 @@
height: 13px;
width: 68px;
background-position: 0 0;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js #volume::-webkit-slider-thumb {
display: block;
margin-top: 1px;
height: 11px;
width: 14px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js #volume::-moz-range-thumb {
margin-top: 1px;
height: 11px;
width: 14px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js #balance {
@ -302,20 +302,20 @@
height: 13px;
width: 38px;
background-position: 0 0;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js #balance::-webkit-slider-thumb {
top: 1px;
height: 11px;
width: 14px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js #balance::-moz-range-thumb {
top: 1px;
height: 11px;
width: 14px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js .windows {
@ -346,13 +346,13 @@
top: 72px;
width: 248px;
height: 10px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
#winamp2-js #position::-webkit-slider-thumb {
height: 10px;
width: 29px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
/*
* Fix the strange bug in Safair/mobile-chrome
* http://stackoverflow.com/questions/26727769/rendering-glitch-when-manipulating-range-input-value-via-javascript-in-webkit
@ -364,7 +364,7 @@
#winamp2-js #position::-moz-range-thumb {
height: 10px;
width: 29px;
cursor:url('../cursors/POSBAR.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/POSBAR.PNG'), auto;
}
/* For some reason, we can't use display: none here */
@ -451,7 +451,7 @@
}
#winamp2-js #shade-time {
cursor:url('../cursors/MAINMENU.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/MAINMENU.PNG'), auto;
}
@ -464,7 +464,7 @@
display: none;
}
#winamp2-js .shade #title-bar {
cursor:url('../cursors/MAINMENU.PNG'), auto;
cursor:url('https://jordaneldredge.com/projects/winamp2-js/cursors/MAINMENU.PNG'), auto;
}
#winamp2-js .shade .actions div {

View file

@ -20,11 +20,7 @@ require([
) {
var node = document.createElement('div');
if (scriptTag.nextSibling) {
scriptTag.parentNode.insertBefore(node, scriptTag.nextSibling);
} else {
scriptTag.parentNode.appendChild(node);
}
scriptTag.parentNode.insertBefore(node, scriptTag);
var media = scriptTag.dataset.media ? scriptTag.dataset.media : 'https://cdn.rawgit.com/captbaritone/llama/master/llama-2.91.mp3';
if(Browser.isCompatible()) {