Merge remote-tracking branch 'origin/master'

This commit is contained in:
Jean-Baptiste Pasquier
2021-04-23 14:44:57 +02:00
8 changed files with 24 additions and 31 deletions

View File

@ -60,7 +60,7 @@
nav.jsRightMenu.segment.sm-hidden.text-disable-selection.sidebar.whitespace-normal(role='navigation')
.segment.whitespace-normal.text-color-heading.text-bold
ul
li.segment.full.sm-hidden.padding-small.text-normal.jsOffsiteToggle
li.segment.full.sm-hidden.padding-small.text-normal.border-bottom.border-color-grey.jsOffsiteToggle
span.icon.icon-arrow-left.icon-xsmall.margin-left-xxsmall.text-left
span.segment.full.text-right(hidden)
span.icon.icon-arrow-right.icon-xsmall.margin-right-xxsmall
@ -69,16 +69,16 @@
if component.route
if component.type == "circles"
solid-link.segment.full(next=`admin-${component.route}`)
li.segment.full.padding-medium
span.icon.ci-bubble-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.circles')
li.segment.full.padding-medium.border-bottom.border-color-grey
span.icon.icon-globe.icon-large.margin-right-medium
a.text-baseline(data-trans='admin.menuRight.circles')
if component.type == "projects"
solid-link.segment.full(next=`admin-${component.route}`)
li.segment.full.padding-medium
span.icon.ci-add.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.projects')
li.segment.full.padding-medium.border-bottom.border-color-grey
span.icon.icon-folder-alt.icon-large.margin-right-medium
a.text-baseline(data-trans='admin.menuRight.projects')
if component.type == "chat"
solid-link.segment.full(next=`admin-${component.route}`)
li.segment.full.padding-medium
span.icon.ci-networking.icon-xlarge.margin-right-medium
a(data-trans='admin.menuRight.community')
li.segment.full.padding-medium.border-bottom.border-color-grey
span.icon.icon-grid.icon-large.margin-right-medium
a.text-baseline(data-trans='admin.menuRight.community')

View File

@ -48,7 +48,7 @@ div
if componentSet.has("communities") && getComponent("chat").route
solid-link.text-hover(next=`admin-${getRoute("chat", true)}`)
li.segment.padding-top-small
a.icon.icon-people.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
a.icon.icon-grid.icon-third.icon-small.icon-margin-right-xsmall(data-trans='admin.menuRight.community')
if componentSet.has("circles") && getComponent("circles").route
solid-link.text-hover(next=`admin-${getRoute("circles", true)}`)
li.segment.padding-top-small