update: imbricate edit in profile & fix css

This commit is contained in:
Jean-Baptiste Pasquier 2019-10-24 22:03:15 +02:00
parent 9e3dc8fe8c
commit 48075b2419
No known key found for this signature in database
GPG Key ID: F2702E6D22ED4D62
7 changed files with 63 additions and 58 deletions

View File

@ -35,10 +35,6 @@ html(lang="en")
#circle(hidden).with-sidebar #circle(hidden).with-sidebar
include page-circle.pug include page-circle.pug
#circle-edit(hidden).no-sidebar
sib-link(class="backlink", bind-resources, next='circle') Back
include page-circle-edit.pug
#messages(hidden).with-sidebar #messages(hidden).with-sidebar
include page-messages.pug include page-messages.pug

View File

@ -81,7 +81,6 @@ nav#main__menu
order-by='username' order-by='username'
next='messages' next='messages'
) )
sib-route(hidden, name='circle-edit', use-id='')
//- div.divider //- div.divider
//- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='') //- sib-route.menu(hidden, name='my-profile', rdf-type='foaf:user', use-id='')

View File

@ -1,4 +1,4 @@
#circle-edit.content-box.with-padding.with-form div.content-box__info
include templates/hd-user-avatar.pug include templates/hd-user-avatar.pug
@ -32,6 +32,8 @@
data-src="${await value['@id']}" data-src="${await value['@id']}"
) )
sib-link(class="backlink", bind-resources, next='circle-profile') Back
h1 Edit your circle h1 Edit your circle
sib-form.block( sib-form.block(

View File

@ -1,5 +1,9 @@
.content-box.full-width.with-form .content-box.full-width.with-form
sib-router(default-route='circle-profile')
sib-route(name='circle-profile')
sib-route(name='circle-edit')
#circle-profile(hidden)
include templates/hd-circle-team.pug include templates/hd-circle-team.pug
div.content-box__header.with-edit div.content-box__header.with-edit
@ -47,3 +51,5 @@
widget-team='team-template' widget-team='team-template'
) )
#circle-edit(hidden)
include page-circle-edit.pug

View File

@ -1,7 +1,7 @@
.views-container .views-container
#circle-chat #circle-chat(hidden)
include page-circle-chat.pug include page-circle-chat.pug
#circle-profile #circle-information(hidden)
include page-circle-profile.pug include page-circle-profile.pug
//-#circle-create //-#circle-create
include page-circle-create.pug include page-circle-create.pug
@ -13,9 +13,6 @@ nav.jsRightMenu(role='navigation')
sib-route(name='circle-chat') sib-route(name='circle-chat')
li li
a Chat a Chat
sib-route(name='circle-profile') sib-route(name='circle-information')
li li
a Information a Information
//-sib-route(name='circle-create')
li
a Add new

View File

@ -89,7 +89,7 @@
@include ci('list'); @include ci('list');
} }
&[name$='profile']>li { &[name$='profile']>li, &[name$='information']>li {
@include ci('information'); @include ci('information');
} }

View File

@ -1,7 +1,12 @@
#circle-profile { #circle-information, #circle-edit {
.content-box__info { .content-box__info {
@extend %padding-block; @extend %padding-block;
.backlink {
text-align: right;
display: block;
}
} }
.block { .block {