autonomic-cooperative/hubl
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

patch: conflict resolved

Browse Source
This commit is contained in:
gaelle morin 2021-04-01 14:21:42 +02:00
parent 84e3383aac
commit 1eda33fab5
No known key found for this signature in database
GPG Key ID: 028426702B95CF9C
1 changed files with 4 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/partials/menu-left.pug
View File

@ -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.segment.text-uppercase.text-letter-spacing-large(data-trans=`${component.name?component.name:"menuLeft.dashboard"}`)
div.divider div.divider
if component.type == "circles" if component.type == "circles"
<<<<<<< HEAD
div.jsMenuTab div.jsMenuTab
div.menu-header.segment.full.padding-xsmall.text-semibold.text-color-white.bg-color-heading.hover.jsMenuHeader div.menu-header.segment.full.padding-xsmall.text-semibold.text-color-white.bg-color-heading.hover.jsMenuHeader
div.segment.margin-right-xxsmall.jsMenuArrow 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}` 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-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-badge.badge(data-type="Mention" data-rdf-type="hd:circle")
solid-route(name=`admin-${component.route}`, hidden) solid-route(name=`admin-${component.route}` hidden)
solid-route(name=`admin-${component.route}-create`, hidden) solid-route(name=`admin-${component.route}-create` hidden)
solid-route(name=`admin-${component.route}-leave`, hidden) solid-route(name=`admin-${component.route}-leave` hidden)
======= solid-route(name=component.route rdf-type='hd:circle' use-id='' 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=`${component.route}-left`) solid-route(name=`${component.route}-left`)
div.sub-menu.menu-notification.padding-bottom-xxsmall.jsMenuSub div.sub-menu.menu-notification.padding-bottom-xxsmall.jsMenuSub
div.loader.loader-menu(id=`loader-${component.route}`) div.loader.loader-menu(id=`loader-${component.route}`)