remove content div margin bottom if alt_np is not shown

This commit is contained in:
geoffrey45
2022-08-27 22:17:24 +03:00
parent a9ce08b092
commit b019fa22c4
4 changed files with 34 additions and 18 deletions
+7 -8
View File
@@ -2,16 +2,15 @@
<ContextMenu /> <ContextMenu />
<Modal /> <Modal />
<Notification /> <Notification />
<div id="app-grid"> <div
id="app-grid"
:class="{
showAltNP: settings.use_alt_np,
}"
>
<LeftSidebar /> <LeftSidebar />
<NavBar /> <NavBar />
<div <div id="acontent" class="rounded">
id="acontent"
class="rounded"
:style="{
marginBottom: !settings.use_alt_np ? '-1rem' : '0',
}"
>
<router-view /> <router-view />
</div> </div>
<NowPlayingRight /> <NowPlayingRight />
+11 -1
View File
@@ -23,7 +23,7 @@
"l-sidebar nav" "l-sidebar nav"
"l-sidebar content" "l-sidebar content"
"l-sidebar content" "l-sidebar content"
"l-sidebar bottombar"; "l-sidebar content";
.r-sidebar, .r-sidebar,
#tabs, #tabs,
#gsearch-input { #gsearch-input {
@@ -32,6 +32,16 @@
} }
} }
#app-grid.showAltNP {
@include tablet-landscape {
grid-template-areas:
"l-sidebar nav"
"l-sidebar content"
"l-sidebar content"
"l-sidebar bottombar";
}
}
#acontent { #acontent {
grid-area: content; grid-area: content;
max-width: 1955px; max-width: 1955px;
-2
View File
@@ -6,7 +6,6 @@
</div> </div>
<nowPlaying v-if="!settings.use_alt_np" /> <nowPlaying v-if="!settings.use_alt_np" />
<!-- <Playlists /> -->
</div> </div>
</template> </template>
@@ -14,7 +13,6 @@
import Navigation from "@/components/LeftSidebar/Navigation.vue"; import Navigation from "@/components/LeftSidebar/Navigation.vue";
import nowPlaying from "@/components/LeftSidebar/nowPlaying.vue"; import nowPlaying from "@/components/LeftSidebar/nowPlaying.vue";
import Logo from "@/components/Logo.vue"; import Logo from "@/components/Logo.vue";
// import Playlists from "./components/LeftSidebar/Playlists.vue";
import useSettingsStore from "@/stores/settings"; import useSettingsStore from "@/stores/settings";
+16 -7
View File
@@ -1,6 +1,6 @@
<template> <template>
<div id="gsearch-input" class="rounded"> <div id="gsearch-input">
<div id="ginner" tabindex="0" class="bg-primary rounded"> <div id="ginner" tabindex="0" class="bg-primary rounded-sm">
<input <input
id="globalsearch" id="globalsearch"
v-model="search.query" v-model="search.query"
@@ -11,9 +11,19 @@
/> />
<SearchSvg /> <SearchSvg />
</div> </div>
<div class="buttons rounded bg-primary"> <div class="buttons rounded-sm bg-primary">
<button @click="tabs.switchToQueue"><QueueSvg /></button> <button
<button @click="tabs.switchToSearch"><SearchSvg /></button> @click="tabs.switchToQueue"
v-if="tabs.current !== tabs.tabs.queue"
>
<QueueSvg />
</button>
<button
@click="tabs.switchToSearch"
v-if="tabs.current !== tabs.tabs.search"
>
<SearchSvg />
</button>
</div> </div>
</div> </div>
</template> </template>
@@ -27,7 +37,6 @@ import useTabStore from "../../stores/tabs";
const search = useSearchStore(); const search = useSearchStore();
const tabs = useTabStore(); const tabs = useTabStore();
const focused = ref(false);
let classList: DOMTokenList | undefined; let classList: DOMTokenList | undefined;
onMounted(() => { onMounted(() => {
@@ -46,7 +55,7 @@ function removeFocusedClass() {
<style lang="scss"> <style lang="scss">
#gsearch-input { #gsearch-input {
display: grid; display: grid;
grid-template-columns: 1fr 7rem; grid-template-columns: 1fr max-content;
gap: 1rem; gap: 1rem;
.buttons { .buttons {