diff --git a/components/Masthead/EubopenAppBar.vue b/components/Masthead/EubopenAppBar.vue index 77f591ff9e6ea55f8a5fb18ee8df4c6aa8e8e168..5abf83afbf579429f2cf689c146e61c86a020aa5 100644 --- a/components/Masthead/EubopenAppBar.vue +++ b/components/Masthead/EubopenAppBar.vue @@ -4,7 +4,9 @@ <MatheadLogos /> </v-col> <v-col cols="12"> - <Toolbar /> + <Sticky> + <Toolbar class="eubopen-toolbar" /> + </Sticky> </v-col> </v-row> </template> @@ -12,12 +14,16 @@ <script> import MatheadLogos from '~/components/Masthead/MatheadLogos.vue' import Toolbar from '~/components/Masthead/Toolbar.vue' + +import Sticky from '~/web-components-submodule/components/common/Utils/Sticky.vue' + export default { components: { MatheadLogos, Toolbar, + Sticky, }, } </script> -<style></style> +<style lang="scss" scoped></style> diff --git a/layouts/default.vue b/layouts/default.vue index 60450c21ce0235ac5d66ca1de19e204aaa551aef..b964648c235128c433ef48917a90dc0fce85742c 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,11 +1,7 @@ <template> <v-app> <Notifications /> - <EubopenAppBar> - <template #logo> - <Logo /> - </template> - </EubopenAppBar> + <EubopenAppBar /> <v-main class="main-app-content"> <v-container> <nuxt /> @@ -19,14 +15,12 @@ import EubopenAppBar from '~/components/Masthead/EubopenAppBar.vue' import Footer from '~/components/footer/Footer.vue' import Notifications from '~/web-components-submodule/components/common/Notifications.vue' -import Logo from '~/components/Logo.vue' export default { components: { EubopenAppBar, Footer, Notifications, - Logo, }, } </script> diff --git a/layouts/entityBrowser.vue b/layouts/entityBrowser.vue index 5f0af70416c64a204709e75c90c3455d0557e5b5..5fcc81796868043dc1557a90f90a90164bb616f7 100644 --- a/layouts/entityBrowser.vue +++ b/layouts/entityBrowser.vue @@ -1,12 +1,8 @@ <template> <v-app> <Notifications /> - <MainAppBar :permanently-pinned="true"> - <template #logo> - <Logo /> - </template> - </MainAppBar> - <v-main class="lowered"> + <EubopenAppBar /> + <v-main> <nuxt /> </v-main> <Footer /> @@ -14,17 +10,15 @@ </template> <script> -import MainAppBar from '~/web-components-submodule/components/common/Masthead/MainAppBar.vue' +import EubopenAppBar from '~/components/Masthead/EubopenAppBar.vue' import Footer from '~/components/footer/Footer.vue' import Notifications from '~/web-components-submodule/components/common/Notifications.vue' -import Logo from '~/components/Logo.vue' export default { components: { - MainAppBar, + EubopenAppBar, Footer, Notifications, - Logo, }, } </script> diff --git a/layouts/reportCard.vue b/layouts/reportCard.vue index 763d375e35d4e19871a48fc927d8ebf73a07eb24..c1414a8468b6ee766b56df12d9eb7211da3c1743 100644 --- a/layouts/reportCard.vue +++ b/layouts/reportCard.vue @@ -1,30 +1,23 @@ <template> <v-app class="the-app"> <Notifications /> - <MainAppBar :permanently-pinned="true" :search-term="searchTerm"> - <template #logo> - <Logo /> - </template> - </MainAppBar> - <v-main class="lowered"> - <nuxt /> - </v-main> + <EubopenAppBar /> + <nuxt /> + <Footer /> </v-app> </template> <script> -import MainAppBar from '~/web-components-submodule/components/common/Masthead/MainAppBar.vue' +import EubopenAppBar from '~/components/Masthead/EubopenAppBar.vue' import Footer from '~/components/footer/Footer.vue' import Notifications from '~/web-components-submodule/components/common/Notifications.vue' -import Logo from '~/components/Logo.vue' export default { components: { - MainAppBar, + EubopenAppBar, Footer, Notifications, - Logo, }, computed: { searchTerm() { @@ -33,8 +26,4 @@ export default { }, } </script> -<style scoped> -.lowered { - margin-top: 80px; -} -</style> +<style scoped></style> diff --git a/pages/compound/_id.vue b/pages/compound/_id.vue index 8db0a49a98d71f3649e425bccc2cf2c0f47ca432..ee72721e839ebda8941cde502acb19a9979940f4 100644 --- a/pages/compound/_id.vue +++ b/pages/compound/_id.vue @@ -11,7 +11,7 @@ export default { components: { ChemicalProbeReportCard, }, - layout: 'default', + layout: 'reportCard', async asyncData({ $axios, error, params }) { try { const docSource = ['pref_name'] diff --git a/pages/compound/browse/_state.vue b/pages/compound/browse/_state.vue index fcb611eb7e624cb97cfa8764aef15502e07744bc..41747b0685cd19987a3efcbdf57faf64498b61dd 100644 --- a/pages/compound/browse/_state.vue +++ b/pages/compound/browse/_state.vue @@ -9,7 +9,7 @@ export default { components: { EBCompoundsBrowser, }, - layout: 'default', + layout: 'entityBrowser', data() { return { isEmbedded: false, diff --git a/pages/target/_id.vue b/pages/target/_id.vue index 6134e9ce5fb63d96e6986eb28c3c3ec8a72ee07f..530329e16d4b516fb84ee9e531836ee3194e4de7 100644 --- a/pages/target/_id.vue +++ b/pages/target/_id.vue @@ -11,7 +11,7 @@ export default { components: { TargetReportCard, }, - layout: 'default', + layout: 'reportCard', async asyncData({ $axios, error, params }) { try { const docSource = ['pref_name'] diff --git a/pages/target/browse/_state.vue b/pages/target/browse/_state.vue index 19ac29bec8aa069814f1f2e9aad9455bf6a5e8a6..dcef4eaf348bd3bf6eff6025c488bd16eddc81aa 100644 --- a/pages/target/browse/_state.vue +++ b/pages/target/browse/_state.vue @@ -8,7 +8,7 @@ export default { components: { EBTargetsBrowser, }, - layout: 'default', + layout: 'entityBrowser', data() { return { isEmbedded: false, diff --git a/web-components-submodule b/web-components-submodule index 9bfa659425ce30739e6404a67d38a55249df8729..b3cc0c893a74ec4555438fa271f7958d160ed6ef 160000 --- a/web-components-submodule +++ b/web-components-submodule @@ -1 +1 @@ -Subproject commit 9bfa659425ce30739e6404a67d38a55249df8729 +Subproject commit b3cc0c893a74ec4555438fa271f7958d160ed6ef