diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue index ec991f0ef..4256278af 100644 --- a/webapp/components/NotificationMenu/NotificationMenu.vue +++ b/webapp/components/NotificationMenu/NotificationMenu.vue @@ -112,16 +112,6 @@ export default { diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js index 5365e0dc1..6d0a0afad 100644 --- a/webapp/constants/headerMenu.js +++ b/webapp/constants/headerMenu.js @@ -1,12 +1,12 @@ export default { MENU: [ // { - // nameIdent: 'ocelotRebranding.newsFeed', + // nameIdent: 'nameIdent', // path: '/', // }, // { - // nameIdent: 'ocelotRebranding.about', - // url: 'https://ocelot.org', + // nameIdent: 'nameIdent', + // url: 'https://ocelot.social', // }, ], } diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 16a4cfc44..e7095d8b6 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -3,7 +3,9 @@ @@ -126,6 +230,8 @@ import SearchField from '~/components/features/SearchField/SearchField.vue' import Modal from '~/components/Modal' import NotificationMenu from '~/components/NotificationMenu/NotificationMenu' import PageFooter from '~/components/PageFooter/PageFooter' +import links from '~/constants/links.js' +import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue' export default { components: { @@ -137,11 +243,14 @@ export default { Modal, NotificationMenu, PageFooter, + PageParamsLink, SearchField, }, mixins: [seo], data() { return { + windowWidth: null, + links, LOGOS, isHeaderMenu: headerMenu.MENU.length > 0, menu: headerMenu.MENU, @@ -159,12 +268,22 @@ export default { const [firstRoute] = this.$route.matched return firstRoute && firstRoute.name === 'index' }, + showMobileMenu() { + if (!this.windowWidth) return false + return this.windowWidth < 810 + }, }, methods: { toggleMobileMenuView() { this.toggleMobileMenu = !this.toggleMobileMenu }, }, + mounted() { + this.windowWidth = window.innerWidth + window.addEventListener('resize', () => { + this.windowWidth = window.innerWidth + }) + }, } @@ -206,18 +325,38 @@ export default { margin-left: auto; text-align: right; } -@media only screen and (min-width: 730px) { - .mobile-hamburger-menu { - display: none; - } + +.mobile-menu { + margin: 0 20px; } -@media only screen and (max-width: 730px) { +.mobile-search { + margin-top: 20px; +} + +.dynamic-branding-mobil, +.dynamic-footer-mobil { + line-height: 30px; + font-size: large; +} +.dynamic-branding-mobil li { + margin: 17px 0; +} + +@media only screen and (max-width: 810px) { #nav-search-box, .main-navigation-right { margin: 10px 0px; } + .main-navigation-right { + width: 100%; + } .hide-mobile-menu { display: none; } } +@media only screen and (min-width: 810px) { + .main-navigation-right { + width: 100%; + } +}