From 5200a2c6fd589f8fff480ea0751a51535adba087 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Oct 2022 12:19:47 +0200 Subject: [PATCH 01/11] fist step mobile footer menu to heder menu --- webapp/components/PageFooter/PageFooter.vue | 5 ++ webapp/layouts/default.vue | 72 ++++++++++++++++++--- 2 files changed, 68 insertions(+), 9 deletions(-) diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue index c71fc4b5c..45ac1ab5a 100644 --- a/webapp/components/PageFooter/PageFooter.vue +++ b/webapp/components/PageFooter/PageFooter.vue @@ -50,4 +50,9 @@ export default { margin-left: 0.2rem; margin-right: 0.2rem; } +@media only screen and (max-width: 730px) { + .ds-footer { + display: none; + } +} diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 8a0e7aa34..61e38dddf 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -4,12 +4,13 @@
+ - + + + + + +
+ + + + + + + +
@@ -126,6 +163,7 @@ import PageFooter from '~/components/PageFooter/PageFooter' import AvatarMenu from '~/components/AvatarMenu/AvatarMenu' import InviteButton from '~/components/InviteButton/InviteButton' import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu.vue' +import links from '~/constants/links.js' export default { components: { @@ -143,6 +181,7 @@ export default { mixins: [seo], data() { return { + links, LOGOS, isHeaderMenu: headerMenu.MENU.length > 0, menu: headerMenu.MENU, @@ -207,18 +246,33 @@ export default { margin-left: auto; text-align: right; } -@media only screen and (min-width: 730px) { - .mobile-hamburger-menu { - display: none; - } + +.footer-mobile ul { + margin-left: 20px; + line-height: 30px; + font-size: large; } + @media only screen and (max-width: 730px) { #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: 730px) { + .footer-mobile, + .mobile-hamburger-menu { + display: none; + } + .main-navigation-right { + width: 100%; + } + +} From b6fa79594c0787697efca2c526b49685c86bf233 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Oct 2022 12:58:50 +0200 Subject: [PATCH 02/11] add components PageParamsLink.vue in layouts default --- webapp/layouts/default.vue | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 61e38dddf..2320e3e43 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -53,8 +53,8 @@ :class="{ 'hide-mobile-menu': !toggleMobileMenu }" :width="{ base: '45%', - sm: '45%', - md: isHeaderMenu ? 'auto' : '45%', + sm: '40%', + md: isHeaderMenu ? 'auto' : '40%', lg: isHeaderMenu ? 'auto' : '50%', }" style="flex-shrink: 0; flex-grow: 1" @@ -107,6 +107,7 @@ + @@ -164,6 +155,8 @@ import AvatarMenu from '~/components/AvatarMenu/AvatarMenu' import InviteButton from '~/components/InviteButton/InviteButton' import CategoriesMenu from '~/components/FilterMenu/CategoriesMenu.vue' import links from '~/constants/links.js' +import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue' + export default { components: { @@ -177,6 +170,7 @@ export default { PageFooter, InviteButton, CategoriesMenu, + PageParamsLink, }, mixins: [seo], data() { From 41e0cc5d3c666b4308180d895707aa0df265ed87 Mon Sep 17 00:00:00 2001 From: ogerly Date: Wed, 19 Oct 2022 14:24:04 +0200 Subject: [PATCH 03/11] dynamic header menu to mobile version --- webapp/layouts/default.vue | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue index 2320e3e43..5d5e6dc6a 100644 --- a/webapp/layouts/default.vue +++ b/webapp/layouts/default.vue @@ -15,6 +15,7 @@ v-for="item in menu" :key="item.name" :class="{ 'hide-mobile-menu': !toggleMobileMenu }" + class="branding-menu" :width="{ base: 'auto' }" style="margin-right: 20px" > @@ -33,6 +34,7 @@ @@ -113,6 +115,39 @@ :class="{ 'hide-mobile-menu': !toggleMobileMenu}" class="footer-mobile" > + + + +
    +
  • + + + + +
  • +
+
+