Merge remote-tracking branch 'origin/main'

src/main/base/browserwindow.ts

@@ -372,7 +372,8 @@ export class BrowserWindow {
      * @yields {object} Electron browser window
      */
     async createWindow(): Promise<Electron.BrowserWindow> {
-        this.clientPort = await getPort({ port: 9000 });
+        const envPort = process.env?.CIDER_PORT || '9000'
+        this.clientPort = await getPort({ port: parseInt(envPort, 10) || 9000 });
         BrowserWindow.verifyFiles();
         this.StartWatcher(utils.getPath('themes'));
 
@@ -1573,4 +1574,4 @@ export class BrowserWindow {
         server2.start();
         console.log('remote broadcasted')
     }
-}
+}

src/renderer/less/directives.less

@@ -35,6 +35,11 @@
             margin          : 0px;
             height          : 100%;
             position        : relative;
+            white-space: nowrap;
+
+            ._svg-icon {
+              flex: 0 0 auto;
+            }
 
             &:before {
               --dist          : 1px;

src/renderer/main/vueapp.js

@@ -1226,7 +1226,7 @@ const app = new Vue({
             } else if (this.cfg.visual.directives[directive]) {
                 return this.cfg.visual.directives[directive]
             } else {
-                return ""
+                return false
             }
         },
         unauthorize() {

src/renderer/views/components/sidebar.ejs

@@ -38,7 +38,7 @@
         </template>
         <div class="app-sidebar-content" scrollaxis="y">
             <!-- AM Navigation -->
-            <template v-if="$root.getThemeDirective('windowLayout') != 'twopanel'">
+            <div v-show="$root.getThemeDirective('windowLayout') != 'twopanel'" class="sidebarCatalogSection">
                 <div
                         class="app-sidebar-header-text"
                         @click="$root.cfg.general.sidebarCollapsed.cider = !$root.cfg.general.sidebarCollapsed.cider"
@@ -84,7 +84,7 @@
                             page="radio"
                     ></sidebar-library-item>
                 </template>
-            </template>
+            </div>
 
             <div
                     class="app-sidebar-header-text"

src/renderer/views/pages/cider-playlist.ejs

@@ -1,5 +1,5 @@
 <script type="text/x-template" id="cider-playlist">
-    <div class="content-inner playlist-page" :class="classes" v-if="data != [] && data.attributes != null"
+    <div class="content-inner playlist-page" :class="classes" :is-album="isAlbum()" v-if="data != [] && data.attributes != null"
 
          :style="{'--bgColor': (data.attributes.artwork != null && data.attributes.artwork['bgColor'] != null) ? ('#' + data.attributes.artwork.bgColor) : ''}">
         <template v-if="app.playlists.loadingState == 0">
@@ -347,6 +347,9 @@
             }
         },
         methods: {
+            isAlbum() {
+                return (this.data.attributes?.playParams?.kind ?? this.data.type ?? '').includes('album')
+            },
             minClass(val) {
                 if(app.appMode == 'fullscreen') {
                     return