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

update: merge conflict resolved + fixes

Browse Source
This commit is contained in:
gaelle morin
2021-01-21 23:54:20 +01:00
parent ef2b2295e4 32b055c2db
commit bc64019b63
28 changed files with 274 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/views/partials/header.pug
View File

@ -104,16 +104,16 @@ div
li.segment.padding-small.sm-padding-medium.sm-padding-left-xlarge.border-bottom.border-color-grey
div(data-trans='header.admin')
ul.text-normal
if (endpoints.users || (endpoints.get && endpoints.get.users))
solid-route.text-hover(name='admin-communities')
if endpoints.get.users
solid-link.text-hover(next='admin-communities')
li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if endpoints.circles || (endpoints.get && endpoints.get.circles)
solid-route.text-hover(name='admin-circles')
if endpoints.get.circles
solid-link.text-hover(next='admin')
li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-globe.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.circles')
if endpoints.projects || (endpoints.get && endpoints.get.projects)
solid-route.text-hover(name='admin-projects')
if endpoints.get.projects
solid-link.text-hover(next='admin-projects')
li.segment.padding-top-small.sm-padding-top-medium
a.icon.icon-folder-alt.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.projects')
li.border-bottom.border-color-grey