Merge branch 'main' into enhancement/search-bar

src/renderer/less/macos.less

@@ -43,7 +43,12 @@ body[platform="darwin"] {
         }
 
         #app-content {
-            background-color: var(--baseColor);
+            background-color: #1e1e1e6b;
         }
     }
+
+    #apple-music-video-player-controls #player-exit {
+        margin-top: 18px;
+        left: 70px;
+    }
 }

src/renderer/style.less

@@ -3247,7 +3247,10 @@ input[type="range"].web-slider.display--small::-webkit-slider-thumb {
   z-index: 100001;
   float: left;
   width: 100%;
-  margin: 10px;
+  margin-left: 10px;
+  margin-right: 10px;
+  margin-top: 10px;
+  margin-bottom: 10px;
   cursor: pointer;
 }
 

src/renderer/views/components/mediaitem-list-item.ejs

@@ -67,7 +67,7 @@
                     </template>
                 </div>
             </div>
-            <div class="heart-icon" v-if="!(app.mk.isPlaying && (((app.mk.nowPlayingItem._songId ?? (app.mk.nowPlayingItem.songId ?? app.mk.nowPlayingItem.id ))  == itemId) || (app.mk.nowPlayingItem.id == item.id)))">
+            <div class="heart-icon">
                 <!-- <div class="heart-unfilled" v-if="isLoved == false" :style="{'--url': 'url(./assets/feather/heart.svg)'}" /> -->
                 <div class="heart-filled" v-if="isLoved == true" :style="{'--url': 'url(./assets/feather/heart-fill.svg)'}" />
             </div>