diff --git a/src/App.vue b/src/App.vue index 681ea89..92b70bb 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,9 +19,6 @@ -
- -
diff --git a/src/assets/css/BottomBar/BottomBar.scss b/src/assets/css/BottomBar/BottomBar.scss index b11d841..d0d72c0 100644 --- a/src/assets/css/BottomBar/BottomBar.scss +++ b/src/assets/css/BottomBar/BottomBar.scss @@ -8,17 +8,7 @@ height: 100%; padding-right: $small; - .ctrl-btn { - height: 2rem; - width: 2rem; - background-size: 1.5rem !important; - cursor: pointer; - border-radius: 0.5rem; - - &:hover { - background-color: $red; - } - } + @include phone-only { grid-template-columns: 1fr 9.2rem; diff --git a/src/assets/css/_variables.scss b/src/assets/css/_variables.scss index 3161839..b6aae3f 100644 --- a/src/assets/css/_variables.scss +++ b/src/assets/css/_variables.scss @@ -1,6 +1,6 @@ // colors -$card-dark: #000000; +$body: #0f1218; $separator: #ffffff2f; $highlight-blue: #006eff; $bbb: #161616; //bottom controls background @@ -14,7 +14,7 @@ $large: 1.5rem; $larger: 2rem; // apple human design guideline colors -$black: #000000; +$black: #181a1c; $white: #ffffffde; $gray: #1c1c1e; @@ -24,8 +24,8 @@ $gray3: rgb(72, 72, 74); $gray4: rgb(58, 58, 60); $gray5: rgb(44, 44, 46); -$red: rgb(255, 69, 58); -$blue: #234ece; +$red: #fa4f55; +$blue: #0960ef; $green: rgb(20, 160, 55); $yellow: rgb(255, 214, 10); $orange: rgb(255, 159, 10); diff --git a/src/assets/css/global.scss b/src/assets/css/global.scss index c001080..2f53f18 100644 --- a/src/assets/css/global.scss +++ b/src/assets/css/global.scss @@ -11,8 +11,7 @@ body { margin: 0; - background-color: #0f1218; - + background-color: $body; color: #fff; font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Helvetica, Arial, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol"; @@ -91,7 +90,7 @@ button { "l-sidebar nav search-input" "l-sidebar content r-sidebar" "l-sidebar content r-sidebar" - "l-sidebar bottom-bar tabs"; + "l-sidebar content tabs"; width: 100vw; height: 100vh; } diff --git a/src/assets/icons/4dots.svg b/src/assets/icons/4dots.svg new file mode 100644 index 0000000..6a16cf0 --- /dev/null +++ b/src/assets/icons/4dots.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/components/AlbumView/Header.vue b/src/components/AlbumView/Header.vue index 92b7362..9669474 100644 --- a/src/components/AlbumView/Header.vue +++ b/src/components/AlbumView/Header.vue @@ -110,7 +110,7 @@ function playAlbum() { position: relative; .stats { - background-color: $gray; + background-color: $red; padding: $small; border-radius: $small; position: absolute; diff --git a/src/components/LeftSidebar/AlbumArt.vue b/src/components/LeftSidebar/AlbumArt.vue index 0a8cf0d..b5e2181 100644 --- a/src/components/LeftSidebar/AlbumArt.vue +++ b/src/components/LeftSidebar/AlbumArt.vue @@ -1,13 +1,22 @@ @@ -15,6 +24,8 @@ import { ref } from "vue"; import state from "../../composables/state"; import SongCard from "./SongCard.vue"; +import HotKeys from "../shared/HotKeys.vue"; +import Progress from "../shared/Progress.vue"; const current = ref(state.current); const props = defineProps({ @@ -26,13 +37,52 @@ const props = defineProps({ \ No newline at end of file + diff --git a/src/components/PlaylistView/Header.vue b/src/components/PlaylistView/Header.vue index b16ea1c..91119c3 100644 --- a/src/components/PlaylistView/Header.vue +++ b/src/components/PlaylistView/Header.vue @@ -37,7 +37,7 @@ bottom: $small; right: $small; padding: 0.5rem; - background-color: rgba(0, 0, 0, 0.699); + background-color: $body; color: rgb(255, 255, 255); font-size: 0.9rem; border-radius: $smaller; @@ -70,7 +70,7 @@ padding: 1rem 1rem 4rem 1rem; box-shadow: 0 0 1.5rem rgba(0, 0, 0, 0.658); border-radius: .75rem; - background-color: $black; + background-color: $body; @include phone-only { width: calc(100% - 1rem); diff --git a/src/components/RightSideBar/Tabs.vue b/src/components/RightSideBar/Tabs.vue index e40cda1..d5ec1df 100644 --- a/src/components/RightSideBar/Tabs.vue +++ b/src/components/RightSideBar/Tabs.vue @@ -23,6 +23,7 @@ const tabs = useTabStore();