From 0c0f33c3e4a956610c47f0bce0d2dc0c86cc3ac6 Mon Sep 17 00:00:00 2001 From: Dario Date: Tue, 23 Apr 2024 19:37:42 +0200 Subject: [PATCH] css and menu user --- theme/albe/scss/preset/extra.scss | 23 ++++++++++++++++++++ theme/albe/templates/navbar_menu.mustache | 16 ++++---------- theme/albe/templates/navbar_menubar.mustache | 22 ++++++++++++------- 3 files changed, 41 insertions(+), 20 deletions(-) diff --git a/theme/albe/scss/preset/extra.scss b/theme/albe/scss/preset/extra.scss index fe6e09a..3251c53 100644 --- a/theme/albe/scss/preset/extra.scss +++ b/theme/albe/scss/preset/extra.scss @@ -38,4 +38,27 @@ z-menu > a { .btn { font-family: inherit; +} + +#page.drawers { + padding: var(--grid-margin); + margin-top: 0; + + & .main-inner { + padding: var(--grid-margin) 0; + margin: 0; + max-width: 100% !important; + } + + & div[role="main"] { + padding: 0; + } + + & .header-maxwidth { + padding: 0; + } +} + +idp-login :is(#divider-container, button#guestbutton) { + display: none !important; } \ No newline at end of file diff --git a/theme/albe/templates/navbar_menu.mustache b/theme/albe/templates/navbar_menu.mustache index 5e90702..fd5828e 100644 --- a/theme/albe/templates/navbar_menu.mustache +++ b/theme/albe/templates/navbar_menu.mustache @@ -7,17 +7,13 @@ {{#children}} {{^divider}} {{#is_action_link}} - - {{{text}}} - + {{{text}}} {{#action_link_actions}} {{> core/actions }} {{/action_link_actions}} {{/is_action_link}} {{^is_action_link}} - - {{{text}}} - + {{{text}}} {{/is_action_link}} {{/divider}} {{#divider}} @@ -36,9 +32,7 @@ {{/action_link_actions}} {{/is_action_link}} {{^is_action_link}} - - {{{text}}} - + {{{text}}} {{/is_action_link}} {{/istablist}} {{^istablist}} @@ -51,9 +45,7 @@ {{/action_link_actions}} {{/is_action_link}} {{^is_action_link}} - - {{{text}}} - + {{{text}}} {{/is_action_link}} {{/istablist}} diff --git a/theme/albe/templates/navbar_menubar.mustache b/theme/albe/templates/navbar_menubar.mustache index 008df55..96c3d52 100644 --- a/theme/albe/templates/navbar_menubar.mustache +++ b/theme/albe/templates/navbar_menubar.mustache @@ -1,11 +1,13 @@ -{{#nodecollection}} - {{#children}} - {{> theme_albe/navbar_menu}} - {{/children}} -{{/nodecollection}} -{{#nodearray}} +{{#output.edit_switch}} + {{#nodecollection}} + {{#children}} + {{> theme_albe/navbar_menu}} + {{/children}} + {{/nodecollection}} + {{#nodearray}} {{> theme_albe/navbar_menu}} -{{/nodearray}} + {{/nodearray}} +{{/output.edit_switch}} {{#usermenu}} {{#unauthenticateduser}} @@ -16,7 +18,11 @@ {{/url}} {{/unauthenticateduser}} {{^unauthenticateduser}} - +
+ {{#usermenu}} + {{> core/user_menu }} + {{/usermenu}} +
{{/unauthenticateduser}} {{/usermenu}}