Merge pull request #1319 from rern/UPDATE

Update
rern · May 25, 2023 · ea20c16 · ea20c16
2 parents ab8aabf + 37f1b4b
commit ea20c16
Show file tree

Hide file tree

Showing 19 changed files with 65 additions and 143 deletions.
diff --git a/install.sh b/install.sh
@@ -173,6 +173,8 @@ fi
 #-------------------------------------------------------------------------------
 installstart "$1"
 
+rm -rf /srv/http/assets/{css,js}
+
 getinstallzip
 
 . $dirbash/common.sh

diff --git a/srv/http/assets/css/camillagui.css b/srv/http/assets/css/camillagui.css
@@ -237,14 +237,12 @@ input[type=checkbox] {
 	border-radius: 3px;
 	background-color: var(--cg) !important;
 	background: radial-gradient( 160% 100% at 50% -50%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 50% -50%, 160% 200%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 }
 input:checked {
 	background-color: var( --cm ) !important;
 }
 input[type=range] {
 	--gloss: radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	--wkgloss: -webkit-radial-gradient( 100% 0%, 225% 90%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 	--track: linear-gradient( 90deg, transparent 10px, var( --cg ) 10px, var( --cg ) calc( 100% - 10px ), transparent 10px );
 	--trackborder : 1px solid var( --cgd );
 	display: block;
@@ -265,7 +263,6 @@ input[type=range]::-webkit-slider-thumb {
 	border: none;
 	border-radius: 3px;
 	background: var( --gloss );
-	background: var( --wkgloss );
 	background-color: var( --cm );
 	-webkit-appearance: none;
 	box-shadow: var( --shadow-btn );
@@ -276,7 +273,6 @@ input[type=range]::-moz-range-thumb {
 	border: none;
 	border-radius: 3px;
 	background: var( --gloss );
-	background: var( --wkgloss );
 	background-color: var( --cm );
 	box-shadow: var( --shadow-btn );
 }
@@ -316,7 +312,6 @@ input[data-tip='Mixer name, must be unique'] {
 	border: none;
 	background-color: var( --cg ) !important;
 	background: radial-gradient( 160% 100% at 50% -50%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 50% -50%, 160% 200%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 	text-shadow: var( --shadow-text );
 	width:36px;
 	height: 36px;
@@ -350,7 +345,6 @@ input[data-tip='Mixer name, must be unique'] {
 	margin-right: 0 !important;
 	border-radius: 3px 0 0 3px;
 	background: radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 100% 0%, 225% 90%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 }
 #button-mute {
 	border-radius: 0;
@@ -372,7 +366,6 @@ input[data-tip='Mixer name, must be unique'] {
 #button-redo {
 	border-radius: 0 3px 3px 0;
 	background: radial-gradient( 300% 90% at 0% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 0% 0%, 300% 90%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 }
 /* compact view */
 ::marker {

diff --git a/srv/http/assets/css/common.css b/srv/http/assets/css/common.css
@@ -10,7 +10,7 @@
 
 @font-face {
 	font-family : rern;
-	src         : url( '/assets/fonts/rern.woff2?v=1683942340' );
+	src         : url( '/assets/fonts/rern.woff2?v=1684895381' );
 }
 @font-face {
 	font-family : Lato;
@@ -400,7 +400,6 @@ codered  {
 
 #infoRange {
 	--gloss: radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	--wkgloss: -webkit-radial-gradient( 100% 0%, 225% 90%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 	--track: linear-gradient( 90deg, transparent 10px, #000000 10px, #000000 calc( 100% - 10px ), transparent 10px );
 	--trackborder : 1px solid var( --cgd );
 }
@@ -420,7 +419,6 @@ codered  {
 	border: none;
 	border-radius: 4px;
 	background: var( --gloss );
-	background: var( --wkgloss );
 	background-color: var( --cm );
 	-webkit-appearance: none;
 	box-shadow: var( --shadow-btn );
@@ -431,7 +429,6 @@ codered  {
 	border: none;
 	border-radius: 4px;
 	background: var( --gloss );
-	background: var( --wkgloss );
 	background-color: var( --cm );
 	box-shadow: var( --shadow-btn );
 }
@@ -485,10 +482,8 @@ codered  {
 input[ type=radio ],
 input[ type=checkbox ] {
 									  /* w    h       x   y   inner(color)       w    outer(color)      w */
-	background:         radial-gradient( 160% 100% at 50% -50%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 50% -50%, 160% 200%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-									  /* x   y   w    h */
-	box-shadow: var( --shadow-check );  /* x, y, blurw, shadoww, color */
+	background: radial-gradient( 125% 100% at 50% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
+	box-shadow: var( --shadow-check );
 }
 .infobtn {
 	display: inline-block;

diff --git a/srv/http/assets/css/hovercursor.css b/srv/http/assets/css/hovercursor.css
@@ -96,6 +96,7 @@ button,
 li:not( .licover ),
 .band,
 .btn,
+.bioback,
 .biosimilar,
 .button-coverart,
 .button-dab-refresh,

diff --git a/srv/http/assets/css/main.css b/srv/http/assets/css/main.css
@@ -234,8 +234,8 @@ i.map.disabled, .map.disabled i {
 #bar-bottom,
 #bar-top,
 #settings {
-	user-select: none;
 	-webkit-user-select: none;
+	user-select: none;
 }
 /* ---------------------- bars ----------------------*/
 #refresh,
@@ -466,19 +466,19 @@ i.map.disabled, .map.disabled i {
 	max-width: 400px;
 }
 #time-knob {
-	order: 1;
 	-webkit-order: 1;
+	order: 1;
 }
 #coverart-block {
-	order: 2;
 	-webkit-order: 2;
-}
-#coverart {
-	display: block; /* fix container div larger tahn img */
+	order: 2;
 }
 #volume-knob {
-	order: 3;
 	-webkit-order: 3;
+	order: 3;
+}
+#coverart {
+	display: block; /* fix container div larger tahn img */
 }
 #coverart-block,
 #divcover {
@@ -516,7 +516,7 @@ i.map.disabled, .map.disabled i {
 	font-size: 18px;
 	line-height: 40px;
 	border-radius: 4px;
-	opacity: 0.8;
+	opacity: 1;
 }
 #volume-band-dn {
 	left: -40px
@@ -606,8 +606,6 @@ i.map.disabled, .map.disabled i {
 	content: '';
 									  /* w    h      x   y   inner(color)       w    outer(color)      w */
 	background:         radial-gradient( 160% 55% at 75% 0%, hsla(0,0%,100%,.15) 50%, hsla(0,0%,100%,0) 50% );
-	background: -webkit-radial-gradient( 75% 0%, 160% 55%,   hsla(0,0%,100%,.15) 50%, hsla(0,0%,100%,0) 50% );
-									  /* x   y   w    h */
 }
 
 .controls {
@@ -623,8 +621,6 @@ i.map.disabled, .map.disabled i {
 	color: var( --cw );
 									  /* w    h       x   y   inner(color)       w    outer(color)      w */
 	background:         radial-gradient( 160% 100% at 50% -50%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 50% -50%, 160% 200%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-									  /* x   y   w    h */
 }
 .btn-default {
 	background-color: var( --cg );
@@ -859,21 +855,13 @@ i.map.disabled, .map.disabled i {
 }
 /* glossy highlight */
 #random, 
-#voldn {
-									  /* w    h      x    y   inner(color)       w    outer(color)      w */
+#voldn,
+#volume-band-dn {									  /* w    h      x    y   inner(color)       w    outer(color)      w */
 	background:         radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 100% 0%, 225% 90%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-									  /* x    y   w    h */
 	background-color: var( --cg );
 }
 #single,
 #volmute {
-	background: -webkit-linear-gradient(
-		top,
-		hsla(0,0%,100%,.3) 0%,
-		hsla(0,0%,100%,.3) 45%,
-		rgba(0,0,0,0) 50%,
-		rgba(0,0,0,0) 100% );
 	background: linear-gradient(
 		to bottom,
 		hsla(0,0%,100%,.3) 0%,
@@ -885,11 +873,9 @@ i.map.disabled, .map.disabled i {
 	border-right: 1px solid var( --cga );
 }
 #repeat,
-#volup {
-									  /* w    h      x  y   inner(color)       w    outer(color)      w */
+#volup,
+#volume-band-up {									  /* w    h      x  y   inner(color)       w    outer(color)      w */
 	background:         radial-gradient( 300% 90% at 0% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 0% 0%, 300% 90%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-									  /* x  y   w    h */
 	background-color: var( --cg );
 }
 /* ------------------- roundSlider ------------------- */
@@ -907,8 +893,6 @@ i.map.disabled, .map.disabled i {
 .rs-container::after { /* glossy overlay */
 									  /* w    h       x   y   inner(color)       w    outer(color)      w */
 	background:         radial-gradient( 160% 100% at 75% 0%, hsla(0,0%,100%,.15) 50%, hsla(0,0%,100%,0) 50% );
-	background: -webkit-radial-gradient( 75% 0%, 160% 100%,   hsla(0,0%,100%,.15) 50%, hsla(0,0%,100%,0) 50% );
-									  /* x   y   w    h */
 	border-radius: 50%;
 }
 .rs-handle,

diff --git a/srv/http/assets/css/settings.css b/srv/http/assets/css/settings.css
@@ -433,10 +433,8 @@ input[type=image] {
 .btn-primary,
 .switchlabel:after,
 input:checked + .switchlabel:after {
-									  /* w    h      x   y   inner(color)       w    outer(color)      w */
-	background:         radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-	background: -webkit-radial-gradient( 100% 0%, 225% 90%,   hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
-									  /* x    y   w    h */
+							  /* w    h      x    y   inner(color)       w    outer(color)      w */
+	background: radial-gradient( 225% 90% at 100% 0%, hsla(0,0%,100%,.3) 50%, hsla(0,0%,100%,0) 55% );
 }
 .switchlabel:after {
 	content: '';

diff --git a/srv/http/assets/js/function.js b/srv/http/assets/js/function.js
@@ -518,7 +518,7 @@ function displayPlayback() {
 	$( '#progress, #time-bar, #time-band' ).toggleClass( 'hide', ! hidetime );
 	$( '#time-band' ).toggleClass( 'disabled', ! S.pllength || S.player !== 'mpd' || S.stream );
 	$( '#time-knob, #coverBL, #coverBR' ).toggleClass( 'disabled', S.stream || ! [ 'mpd', 'upnp' ].includes( S.player ) );
-	$( '.volumeband' ).toggleClass( 'hide', D.volume );
+	$( '.volumeband' ).toggleClass( 'disabled', ! hidevolume );
 	$( '#map-time' ).toggleClass( 'hide', D.cover );
 	$( '#button-time, #button-volume' ).toggleClass( 'hide', ! D.buttons );
 	$( '#playback-row' ).css( 'align-items', D.buttons ? '' : 'center' );
@@ -2007,7 +2007,7 @@ function volumeBarSet( pageX ) {
 	$volumeRS.setValue( S.volume );
 }
 function volumeBarShow() {
-	if ( S.volumenone || ! $( '#volume-bar' ).hasClass( 'hide' ) ) return
+	if ( ! $( '#volume-bar' ).hasClass( 'hide' ) ) return
 
 	V.volumebar = setTimeout( volumeBarHide, 3000 );
 	$( '#volume-text' )

diff --git a/srv/http/assets/js/main.js b/srv/http/assets/js/main.js
@@ -612,7 +612,9 @@ $( '#volume' ).roundSlider( {
 		$volumehandlerotate.css( 'transition-duration', speed +'ms' );
 		setTimeout( () => {
 			$volumehandlerotate.css( 'transition-duration', '100ms' );
-			$( '#volume-knob, #button-volume i' ).removeClass( 'disabled' );
+			$( '#volume-knob, #volmute' ).removeClass( 'disabled' );
+			$( '#voldn' ).toggleClass( 'disabled', S.volume === 0 );
+			$( '#volup' ).toggleClass( 'disabled', S.volume === 100 );
 		}, speed );
 	}
 	, drag              : function( e ) {
@@ -641,7 +643,7 @@ $( '#volume' ).roundSlider( {
 $( '#volume-band' ).on( 'touchstart mousedown', function() {
 	guideHide();
 	clearTimeout( V.volumebar );
-	if ( S.volumenone || $( '#volume-bar' ).hasClass( 'hide' ) ) return
+	if ( $( '#volume-bar' ).hasClass( 'hide' ) ) return
 
 	V.start = true;
 } ).on( 'touchmove mousemove', function( e ) {
@@ -667,6 +669,7 @@ $( '#volmute, #volM' ).on( 'click', function() {
 $( '#voldn, #volup, #volT, #volB, #volL, #volR, #volume-band-dn, #volume-band-up' ).on( 'click', function( e ) {
 	local();
 	volumeUpDown( $( e.currentTarget ).hasClass( 'up' ) );
+	if ( [ 'volume-band-dn', 'volume-band-up' ].includes( e.currentTarget.id ) ) $( '#volume-text, #volume-bar' ).removeClass( 'hide' );
 } ).on( 'touchend mouseup', function( e ) {
 	clearInterval( V.interval.volume );
 	if ( ! $( '#volume-bar' ).hasClass( 'hide' ) ) {
@@ -836,7 +839,6 @@ $( '.map' ).on( 'click', function( e ) {
 			}
 			$( '.band' ).addClass( 'transparent' );
 			$( '#volume-bar, #volume-text' ).addClass( 'hide' );
-			$( '.volumeband' ).toggleClass( 'hide', D.volumenone );
 			displayBars();
 			setButtonControl();
 			displayPlayback();