Integrate nav

- other minor refactors
This commit is contained in:
geoffrey45
2022-04-14 11:30:19 +03:00
parent 90d646d674
commit 85c59b4cba
28 changed files with 266 additions and 141 deletions
+1 -1
View File
@@ -46,7 +46,7 @@ onBeforeRouteUpdate(async (to) => {
.songs {
padding: $small;
min-height: calc(100% - 30rem);
min-height: calc(100% - 32rem);
}
&::-webkit-scrollbar {
+8 -11
View File
@@ -1,8 +1,5 @@
<template>
<div id="f-view-parent" class="rounded">
<div class="fixed">
<Header :path="FStore.path" :first_song="FStore.tracks[0]" />
</div>
<div id="scrollable" ref="scrollable">
<FolderList :folders="FStore.dirs" />
<div
@@ -20,7 +17,6 @@ import { onBeforeRouteUpdate } from "vue-router";
import SongList from "@/components/FolderView/SongList.vue";
import FolderList from "@/components/FolderView/FolderList.vue";
import Header from "@/components/FolderView/Header.vue";
import useFStore from "../stores/folder";
import state from "../composables/state";
@@ -44,9 +40,10 @@ onBeforeRouteUpdate((to) => {
<style lang="scss">
#f-view-parent {
position: relative;
padding: 4rem $small 0 $small;
padding: 0 $small 0 $small;
overflow: hidden;
margin: $small;
margin-top: $small;
.h {
font-size: 2rem;
@@ -54,12 +51,12 @@ onBeforeRouteUpdate((to) => {
}
}
#f-view-parent .fixed {
position: absolute;
height: min-content;
width: calc(100% - 1rem);
top: 0.5rem;
}
// #f-view-parent .fixed {
// position: absolute;
// height: min-content;
// width: calc(100% - 1rem);
// top: 0.5rem;
// }
#scrollable {
overflow-y: auto;
+1 -1
View File
@@ -49,7 +49,7 @@ const playlist = usePTrackStore();
}
.songlist {
padding: $small;
min-height: calc(100% - 30rem);
min-height: calc(100% - 32rem);
}
}
</style>
+2 -2
View File
@@ -22,15 +22,15 @@ const pStore = usePStore();
<style lang="scss">
#p-view {
margin: $small;
margin-top: 0;
padding: $small;
overflow: auto;
scrollbar-color: $gray2 transparent;
border-top: 1px solid $gray3;
.grid {
display: grid;
grid-template-columns: repeat(auto-fill, minmax(10rem, 1fr));
gap: $small;
gap: 1rem;
}
}
</style>