diff --git a/package.json b/package.json index 1745bd10..ecafb20a 100644 --- a/package.json +++ b/package.json @@ -11,17 +11,14 @@ "dependencies": { "@vueuse/core": "^8.5.0", "axios": "^0.26.1", - "defu": "^6.0.0", - "mitt": "^3.0.0", "pinia": "^2.0.11", - "register-service-worker": "^1.7.1", "sass": "^1.49.0", "sass-loader": "^10", "vite-svg-loader": "^3.4.0", "vue": "^3.2.37", "vue-debounce": "^3.0.2", "vue-router": "^4.1.3", - "webpack": "^5.64.4" + "webpack": "^5.74.0" }, "devDependencies": { "@vitejs/plugin-vue": "^3.0.1", diff --git a/src/assets/scss/Global/app-grid.scss b/src/assets/scss/Global/app-grid.scss index 910170ea..8d538ac6 100644 --- a/src/assets/scss/Global/app-grid.scss +++ b/src/assets/scss/Global/app-grid.scss @@ -18,7 +18,7 @@ #acontent { grid-area: content; max-width: 1955px; - overflow: hidden auto; + overflow: hidden scroll; margin-top: -$small; .nav { diff --git a/src/assets/scss/Global/index.scss b/src/assets/scss/Global/index.scss index 3b1bb32e..cc90a3e4 100644 --- a/src/assets/scss/Global/index.scss +++ b/src/assets/scss/Global/index.scss @@ -1,11 +1,5 @@ -@import -"./app-grid.scss", -"./controls.scss", -"./inputs.scss", -"./scrollbars.scss", -"./state.scss", -"./variants.scss", -"./basic.scss"; +@import "./app-grid.scss", "./controls.scss", "./inputs.scss", + "./scrollbars.scss", "./state.scss", "./variants.scss", "./basic.scss"; :root { --separator: #ffffff46; @@ -22,6 +16,7 @@ body { color: #fff; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; + font-family: "SF Compact Display" !important; font-size: 1rem; overflow: hidden; image-rendering: -webkit-optimize-contrast; diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss index 8c1a0e3f..1549b452 100644 --- a/src/assets/scss/index.scss +++ b/src/assets/scss/index.scss @@ -1,4 +1,4 @@ -@import +@import "./mixins.scss", "./variables", "./moz.scss", @@ -6,3 +6,9 @@ "./BottomBar/BottomBar.scss", "./Global" ; + + +@font-face { + font-family: "SF Compact Display"; + src: url("../sf-compact.woff") format("woff"); +} diff --git a/src/assets/sf-compact.woff b/src/assets/sf-compact.woff new file mode 100644 index 00000000..a1cfb319 Binary files /dev/null and b/src/assets/sf-compact.woff differ diff --git a/src/components/RightSideBar/Home/Recommendation.vue b/src/components/RightSideBar/Home/Recommendation.vue index b6926ff7..b21d9844 100644 --- a/src/components/RightSideBar/Home/Recommendation.vue +++ b/src/components/RightSideBar/Home/Recommendation.vue @@ -3,7 +3,7 @@
Similar tracks
- +
{{ song.title }}
{{ song.artist }}
diff --git a/src/components/RightSideBar/Queue.vue b/src/components/RightSideBar/Queue.vue index 584b1d30..0bf7ffdd 100644 --- a/src/components/RightSideBar/Queue.vue +++ b/src/components/RightSideBar/Queue.vue @@ -71,20 +71,15 @@ onUpdated(() => { .scrollable-r { height: 100%; - padding: $small; overflow: hidden; display: grid; grid-template-rows: max-content 1fr; - gap: $medium; .inner { - height: 100%; - margin-right: -$small; overflow: scroll; - margin-top: 1rem; - padding-right: $small; overflow-x: hidden; scrollbar-color: grey transparent; + margin: 1rem 0; } } } diff --git a/src/components/RightSideBar/Queue/QueueActions.vue b/src/components/RightSideBar/Queue/QueueActions.vue index 34ea18df..e5445506 100644 --- a/src/components/RightSideBar/Queue/QueueActions.vue +++ b/src/components/RightSideBar/Queue/QueueActions.vue @@ -33,8 +33,8 @@ const queue = useQueueStore(); display: flex; justify-content: space-between; gap: $small; - margin-bottom: -1.25rem; - margin-top: $small; + margin: 1rem; + margin-bottom: 0; .action { padding: $smaller; diff --git a/src/components/RightSideBar/Search/AlbumGrid.vue b/src/components/RightSideBar/Search/AlbumGrid.vue index 89fc819f..5872886b 100644 --- a/src/components/RightSideBar/Search/AlbumGrid.vue +++ b/src/components/RightSideBar/Search/AlbumGrid.vue @@ -1,5 +1,5 @@