EUbOPEN: finish changing layout of masthead and navigators to comply to IMI guidelines

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>

layouts/default.vue

 <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>

layouts/entityBrowser.vue

 <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>

layouts/reportCard.vue

 <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>

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']

pages/compound/browse/_state.vue

@@ -9,7 +9,7 @@ export default {
   components: {
     EBCompoundsBrowser,
   },
-  layout: 'default',
+  layout: 'entityBrowser',
   data() {
     return {
       isEmbedded: false,

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']

pages/target/browse/_state.vue

@@ -8,7 +8,7 @@ export default {
   components: {
     EBTargetsBrowser,
   },
-  layout: 'default',
+  layout: 'entityBrowser',
   data() {
     return {
       isEmbedded: false,

web-components-submodule @ b3cc0c89

-Subproject commit 9bfa659425ce30739e6404a67d38a55249df8729
+Subproject commit b3cc0c893a74ec4555438fa271f7958d160ed6ef