Merge pull request #1853 from rern/UPDATE

Update
rern · Dec 27, 2024 · 0a5ec10 · 0a5ec10
2 parents 004dd27 + b44fef6
commit 0a5ec10
Show file tree

Hide file tree

Showing 23 changed files with 510 additions and 576 deletions.
diff --git a/install.sh b/install.sh
@@ -4,10 +4,6 @@ alias=r1
 
 . /srv/http/bash/settings/addons.sh
 
-# 20241212
-file=$dirsystem/display.json
-! grep -q overlayno $file && sed -i '/composername/ a\  "overlayno": false,' $file
-
 # 20241208
 rm -f $dirshm/playlist*
 
@@ -76,10 +72,6 @@ if [[ -e $file && $( sed -n -E '/^charmap/,/^p0/ p' $file | wc -l ) -gt 2 ]]; th
 	echo -e $conf > $file
 fi
 
-# 20241011
-file=$dirsystem/powerbutton.conf
-[[ -e $file ]] && sed -i '/reserved/ d' $file
-
 #-------------------------------------------------------------------------------
 installstart "$1"
 

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=1733897751' );
+	src         : url( '/assets/fonts/rern.woff2?v=1733921041' );
 }
 @font-face {
 	font-family : Lato;
@@ -100,7 +100,6 @@ i {
 .i-mixers::before          { content: '\F50C' }
 .i-eye::before             { content: '\F567' }
 .i-file::before,
-.i-file-playlist::before,
 .i-playlists::before       { content: '\F548' }
 .i-file-music::before      { content: '\F549' }
 .i-filters::before         { content: '\F52A' }

diff --git a/srv/http/assets/css/hovercursor.css b/srv/http/assets/css/hovercursor.css
@@ -1,5 +1,5 @@
 /* :hover *********************************************************/
-#lib-path a:hover {
+#lib-title a:hover {
 	color: var( --cm );
 }
 #lib-list li:hover,
@@ -125,7 +125,7 @@ li:not( .licover ),
 #eq i,
 #eq .label a,
 #liboptions,
-#lib-path a,
+#lib-title a,
 #lib-search-close,
 #lyrics i,
 #page-library i.search,
@@ -144,11 +144,11 @@ li:not( .licover ),
 #volume-text {
 	cursor: pointer;
 }
-#lib-path a:last-of-type:hover,
+#lib-title a:last-of-type:hover,
 .mode.nodata * {
 	cursor: default;
 }
-#lib-path a:last-of-type:hover {
+#lib-title a:last-of-type:hover {
 	color: var( --cw );
 }
 #bio .container:focus-visible,

diff --git a/srv/http/assets/css/main.css b/srv/http/assets/css/main.css
@@ -480,6 +480,9 @@ i.map.disabled, .map.disabled i {
 }
 #coverart {
 	display: block; /* fix container div larger tahn img */
+	margin: 0 auto;
+	min-width: 230px;
+	max-width: 100%;
 }
 #coverart-block,
 #divcover {
@@ -719,6 +722,10 @@ i.map.disabled, .map.disabled i {
 .mapvolume {
 	background: var( --cg );
 }
+.wl.narrow { width: 46% }
+.c1.narrow { margin-left: 5% }
+.c2.narrow { margin-left: 27% }
+.c3.narrow { margin-left: 73% }
 #coverT,
 #timeT {
 	background: var( --cga );
@@ -1232,20 +1239,6 @@ i.map.disabled, .map.disabled i {
 	text-align: center;
 	color: var( --cg60 );
 }
-.mode .i-album,
-.mode .i-albumartist {
-	width: 45px;
-}
-.mode .i-date,
-.mode .i-latest {
-	width: 40px;
-}
-.mode .i-artist,
-.mode .i-conductor,
-.mode .i-sd,
-.mode .i-playlists {
-	width: 36px;
-}
 #lib-mode-list gr {
 	position: absolute;
 	top: 45px;
@@ -1403,6 +1396,9 @@ i.map.disabled, .map.disabled i {
 #lib-title a:last-of-type {
 	color: var( --cw );
 }
+#lib-title.path a {
+	font-weight: normal;
+}
 .button-coverart {
 	position:relative;
 	display: inline-block;
@@ -1601,8 +1597,12 @@ i.map.disabled, .map.disabled i {
 	font-size: 22px !important;
 	line-height: 25px !important;
 	vertical-align: -5px;
+	text-align: center;
 	color: var( --cg60 ) !important;
 }
+.liinfo c {
+	background: var( --cg );
+}
 .mode.updn {
 	background: var( --cga );
 }
@@ -1675,6 +1675,7 @@ li.active .iconthumb {
 	background: none !important;
 }
 #indexcover,
+.lib-path,
 .lipath,
 .lidir,
 .liname,
@@ -1732,7 +1733,20 @@ li.active .iconthumb {
 #pl-list li.radio {
 	margin: 0;
 }
-
+#pl-list li.pause .elapsed::before,
+#pl-list li.play .elapsed::before {
+	content: '\F504';
+	font-family: rern;
+	margin: 0 10px;
+	color: var( --cga );
+}
+#pl-list li.play .elapsed::before {
+	content: '\F503';
+}
+#pl-list li.pause .time::before,
+#pl-list li.play .time::before {
+	content: ' / ';
+}
 .mode.nodata i {
 	color: var( --cg ) !important;
 }
@@ -1794,7 +1808,7 @@ li.active .li2 a,
 li.active .li2 span,
 li.active gr,
 li.active .time,
-.licover.active .i-file-playlist {
+.licover.active .i-playlists {
 	color: var( --cga ) !important;
 }
 li.active .li-icon.wh {
@@ -2072,10 +2086,6 @@ li.active .li2 bl {
 			opacity: 0 !important;
 		}
 		#bar-bottom.translucent { opacity: 0.6 !important }
-		.wl { width: 46% }
-		.c1 { margin-left: 5% }
-		.c2 { margin-left: 27% }
-		.c3 { margin-left: 73% }
 	}
 	@media ( max-width: 480px ) {
 		#playback-controls i { margin: 0 5px }

diff --git a/srv/http/assets/css/settings.css b/srv/http/assets/css/settings.css
@@ -3,6 +3,13 @@
 .container input[type=checkbox] { z-index: 1 }
 
 #listwlscan .i-lock { font-size: 16px; vertical-align: 1px }
+li.current a::before,
+li.profile a::before {
+	content: '• ';
+}
+li.current a::before {
+	color: #0f0;
+}
 .menu {
 	position: absolute;
 	left: calc( 50% - 650px / 2 + 45px );
@@ -639,8 +646,9 @@ input.disabled + .switchlabel:after {
 	#divmpd .help { display: none }
 }
 @media (hover: hover) {
-	#bar-bottom div:hover,
-	#bar-bottom div.active:hover { background-color: var( --cmd ) }
+	#bar-bottom div:hover { background-color: var( --cgl ) }
+	#bar-bottom div.active:hover { background-color: var( --cml ) }
+	#bar-bottom div:hover span { color: var( --cw ) }
 	a:hover { text-decoration: none }
 	.entries li:hover { background: var( --cga ) }
 	#menu a:hover {