From 1eda33fab570a061906d377aedcc8c4967b4b759 Mon Sep 17 00:00:00 2001 From: gaelle morin Date: Thu, 1 Apr 2021 14:21:42 +0200 Subject: [PATCH] patch: conflict resolved --- src/views/partials/menu-left.pug | 26 ++++---------------------- 1 file changed, 4 insertions(+), 22 deletions(-) diff --git a/src/views/partials/menu-left.pug b/src/views/partials/menu-left.pug index fe3563f..23a74ea 100644 --- a/src/views/partials/menu-left.pug +++ b/src/views/partials/menu-left.pug @@ -24,7 +24,6 @@ solid-router#navbar-router(default-route='dashboard') div.segment.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.dashboard"}`) div.divider if component.type == "circles" -<<<<<<< HEAD div.jsMenuTab div.menu-header.segment.full.padding-xsmall.text-semibold.text-color-white.bg-color-heading.hover.jsMenuHeader div.segment.margin-right-xxsmall.jsMenuArrow @@ -37,27 +36,10 @@ solid-router#navbar-router(default-route='dashboard') solid-link.segment.full.one-line-ellipsis.padding-xxsmall.sm-padding-xsmall(next=`admin-${component.route}` data-trans="menuLeft.circlesBrowse") solid-link.segment.full.one-line-ellipsis.padding-xxsmall.sm-padding-xsmall(next=`admin-${component.route}-create` data-trans="menuLeft.circleCreate") solid-badge.badge(data-type="Mention" data-rdf-type="hd:circle") - solid-route(name=`admin-${component.route}`, hidden) - solid-route(name=`admin-${component.route}-create`, hidden) - solid-route(name=`admin-${component.route}-leave`, hidden) -======= - div.menu-wrapper - if componentSet.has("admin") - solid-route.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading.hover.active(name=`admin-${component.route}`) - div.segment.margin-right-xxsmall - div.segment.icon.icon-small.icon-folder-alt - div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.circles"}`) - div.menu-chevron.segment - div.menu-icon.icon-arrow-right-circle - solid-route(name=`admin-${component.route}-create`) - solid-route(name=`admin-${component.route}-leave`) - else - div.menu.segment.full.padding-small.text-semibold.text-color-white.heading-active.bg-color-heading - div.segment.margin-right-xxsmall - div.segment.icon.icon-small.icon-folder-alt - div.segment.three-quarter.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.circles"}`) ->>>>>>> 4860b20e20e4be6643aaaa0c5f8c1ea3d015ee3b - solid-route(name=component.route, rdf-type='hd:circle', use-id='', hidden) + solid-route(name=`admin-${component.route}` hidden) + solid-route(name=`admin-${component.route}-create` hidden) + solid-route(name=`admin-${component.route}-leave` hidden) + solid-route(name=component.route rdf-type='hd:circle' use-id='' hidden) solid-route(name=`${component.route}-left`) div.sub-menu.menu-notification.padding-bottom-xxsmall.jsMenuSub div.loader.loader-menu(id=`loader-${component.route}`)